EliseDup
|
7f34f9ea0d
|
Merge conflict resolved
|
8 years ago |
EliseDup
|
3efa7c92bc
|
Merge commit '428b5a87e862d422af23bd418dc92bf7ac082b2d' into
9.0-s0023-elise_new
# Conflicts:
# beesdoo_product/views/beesdoo_product.xml
|
8 years ago |
EliseDup
|
5033d50de1
|
Merge commit '428b5a87e862d422af23bd418dc92bf7ac082b2d' into 9.0-s010cr-elise_new
# Conflicts:
# beesdoo_base/views/partner.xml
|
8 years ago |
EliseDup
|
7af07c473e
|
Merge commit '428b5a87e862d422af23bd418dc92bf7ac082b2d' into 9.0-s003bis-elise_new
|
8 years ago |
EliseDup
|
1e193151f2
|
Merge commit '428b5a87e862d422af23bd418dc92bf7ac082b2d' into 9.0-S0016-jeanmarc
|
8 years ago |
Thibault Francois
|
428b5a87e8
|
[ADD] add info in readme
|
8 years ago |
EliseDup
|
70393ae39c
|
Traduire les termes en FR
|
8 years ago |
EliseDup
|
5539c97a6b
|
Undo commit on wrong branch
|
9 years ago |
EliseDup
|
37b127c7a8
|
Country required in res.partner
|
9 years ago |
EliseDup
|
2081a339d4
|
Traduction vers l'anglais des termes en français dans le code
|
9 years ago |
EliseDup
|
af7bde5748
|
Merge remote-tracking branch 'origin/9.0' into 9.0-S010CR-Elise
|
9 years ago |
EliseDup
|
edc03a202a
|
Merge remote-tracking branch 'origin/9.0' into 9.0-S003bis-Elise
|
9 years ago |
EliseDup
|
c33521f876
|
Merge remote-tracking branch 'origin/9.0' into 9.0-S0023-Elise
|
9 years ago |
Thibault Francois
|
8e6d8c0d94
|
[FIX] do not fail if consignes tax group does not exist
|
9 years ago |
EliseDup
|
f0b6ff4fd9
|
Merge branch '9.0' of https://github.com/beescoop/Obeesdoo into 9.0-S0025-Elise
# Conflicts:
# beesdoo_base/__openerp__.py
|
9 years ago |
Thibault Francois
|
3300d09807
|
Update __openerp__.py
Add missing dependency on beesdoo_pos
|
9 years ago |
Thibault Francois
|
69854e6f0e
|
Update __openerp__.py
Add Purchase dependency to beesdoo_base
|
9 years ago |
Thibault Francois
|
dfdd29d264
|
[CHANGE] use old and new balance date as unique ID, be sure to have no conflict with old unique id in coda
|
9 years ago |
Thibault Francois
|
5d5fbb8d93
|
[FIX] wrong unique ID + find the iban when give the bban account number
|
9 years ago |
EliseDup
|
4ff1b2ec0c
|
"Label" instead of "Etiquette"
|
9 years ago |
EliseDup
|
492c8707fe
|
Add profit margin in product_category
|
9 years ago |
EliseDup
|
b704115439
|
Add suggested price and change naming ( exVAT price instead of price)
|
9 years ago |
EliseDup
|
5387e0cd96
|
Ajout d'un wizard pour créer un nouvel enfant directement chez le travailleur. Correction de qq mots qui étaient encore en français
|
9 years ago |
EliseDup
|
f2bc207b2d
|
S010 : afficher le champ "Mangeur/Travailleur" seulement si le res.partner est un CLIENT (et indépendant de si c'est une société ou un particulier)
|
9 years ago |
EliseDup
|
e1e2e4b48d
|
progress
|
9 years ago |
EliseDup
|
2bc2d1b8fd
|
Progress
|
9 years ago |
EliseDup
|
9fd6cb1a25
|
Demander l'impression automatique de la carte de membre que on en crée une nouvelle
|
9 years ago |
Thibault Francois
|
03a19c3b3b
|
[MERGE][S0012bis] Gestion d'impression des étiquettes des articles
|
9 years ago |
Thibault Francois
|
1ead5626c6
|
[MERGE][S0012] Gestion d'impression des BEES card de membres
|
9 years ago |
Thibault Francois
|
f2e086066b
|
[FIX] Few remarks from Virgine and Nicolas
|
9 years ago |
Thibault Francois
|
44324f1d7b
|
[MERGE][S0011] Infos étiquettes sur l'article author: Samuel et Grégoire
|
9 years ago |
Thibault Francois
|
ac87170894
|
[MERGE][S0011] Infos étiquettes sur l'article author: Samuel et Grégoire
|
9 years ago |
Thibault Francois
|
89a8d2fae1
|
[MERGE] Import codas
|
9 years ago |
Thibault Francois
|
a25777d002
|
[ADD] Code barre pour membre GA - nouveaux coop
|
9 years ago |
gregoire
|
9e92d0d14f
|
trying to bring lost fields back
|
9 years ago |
gregoire
|
531f22bb39
|
add actions request print and set as printed label
|
9 years ago |
Thibault Francois
|
2ab74ed566
|
[ADD] import coda using https://github.com/acsone/pycoda/
|
9 years ago |
gregoire
|
3d69b271c7
|
remove print
|
9 years ago |
gregoire
|
3d62e9700b
|
add actions for request_membercard_printing and set_membercard_as_printed with a wizard, a view and an action in model for each
|
9 years ago |
gregoire
|
45c3e1031c
|
add member_card_to_be_printed and last_printed fields
|
9 years ago |
Thibault Francois
|
5159323681
|
[FIX] Default Value for required field on res.partner
|
9 years ago |
Thibault Francois
|
2ac18e508f
|
[FIX] Runbot Warning and traceback
|
9 years ago |
Thibault Francois
|
66cb326117
|
[CLEAN] Format XML
|
9 years ago |
Thibault Francois
|
45f8b2a31c
|
[MERGE] [Feedback] 0004 - Cash Opening Balance
|
9 years ago |
jmf
|
9180628195
|
[FIX] Changed the way the partner's country_id is flagged as 'mandatory'
|
9 years ago |
gregoire
|
a328bb9feb
|
fix display unit, add seller id, fix xml
|
9 years ago |
jmf
|
d1756a1fe6
|
[IMPL] Added 'responsible person' to stock picking tree view
|
9 years ago |
Thibault Francois
|
7bbbc48c44
|
[ADD] OCA env ribbon + [FIX] for v9
|
9 years ago |
jmf
|
34f334d64e
|
[IMPL] Added mail.followers
|
9 years ago |
jmf
|
f1b6599b60
|
[ADD] Added max_shipping_date, responsible person
|
9 years ago |