Laurent Destailleur
|
2062047dea
|
Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder
FIX : origin & origin id on supplier order line
|
2017-03-23 20:03:58 +01:00 |
|
Laurent Destailleur
|
3adb43c6e5
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-03-23 12:52:19 +01:00 |
|
Laurent Destailleur
|
7df9c25e60
|
Several fixes on multicurrency
|
2017-03-23 12:44:20 +01:00 |
|
gauthier
|
a790ef9f7c
|
FIX : origin & origin id on supplier order line
|
2017-03-23 12:35:43 +01:00 |
|
Laurent Destailleur
|
ac19aba07e
|
FIX multicurrency management on supplier order/invoice
Conflicts:
htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
|
2017-03-19 15:41:55 +01:00 |
|
Laurent Destailleur
|
e85206dee5
|
FIX multicurrency management on supplier order/invoice
|
2017-03-19 15:37:07 +01:00 |
|
Laurent Destailleur
|
4831fb4dcb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
|
2017-03-19 11:26:49 +01:00 |
|
Juanjo Menent
|
5c028b30d5
|
Fix #6512 Bug: Invalid argument in when submitting orderstoinvoice.php-form
|
2017-03-17 17:05:59 +01:00 |
|
Laurent Destailleur
|
c72e7c1057
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/files.lib.php
|
2017-03-10 14:54:35 +01:00 |
|
Laurent Destailleur
|
184d52525a
|
PHP code to manage pair/impair is replaced by native CSS.
|
2017-03-07 22:45:22 +01:00 |
|
Laurent Destailleur
|
d38818ff11
|
Fix option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS not correctly
supported.
|
2017-03-06 13:01:04 +01:00 |
|
Laurent Destailleur
|
19e60f03b9
|
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
|
2017-02-21 14:17:44 +01:00 |
|
Laurent Destailleur
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +01:00 |
|
Marcos García de La Fuente
|
d06fb423c0
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
|
2017-02-02 20:07:41 +01:00 |
|
Laurent Destailleur
|
cd6f5fb8cb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-02 02:26:09 +01:00 |
|
Laurent Destailleur
|
13f37b2cb9
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-02 02:25:49 +01:00 |
|
Laurent Destailleur
|
f6144b9ecb
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-02-02 02:24:57 +01:00 |
|
Laurent Destailleur
|
672e81d466
|
Merge pull request #6352 from philippe-opendsi/develop
NEW Option to reload supplier order and invoice create page
|
2017-02-02 01:23:53 +01:00 |
|
Laurent Destailleur
|
c3fb559d3b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modProduct.class.php
|
2017-02-01 20:58:17 +01:00 |
|
Laurent Destailleur
|
fbbf8cd8a4
|
Fix bad side effect of uniformizing a constant name.
|
2017-02-01 15:47:08 +01:00 |
|
Laurent Destailleur
|
d945a0de92
|
NEW Uniformize behaviour: Action to make order is an action button.
|
2017-02-01 14:59:51 +01:00 |
|
philippe-opendsi
|
399aea179f
|
New : Option to reload supplier order and invoice to retrieve payment terms & type
Add RELOAD_PAGE_ON_SUPPLIER_CHANGE
|
2017-01-31 10:15:04 +01:00 |
|
arnaud
|
c79137d14c
|
FIX Supplier Order list filter by project
|
2017-01-30 17:29:01 +01:00 |
|
Ferran Marcet
|
cb5117ad06
|
Fix: Invalid variable. Shoud be $object
|
2017-01-25 16:08:46 +01:00 |
|
Ferran Marcet
|
7f87f6688b
|
Fix: Invalid variable. Shoud be $object
|
2017-01-25 12:58:21 +01:00 |
|
Laurent Destailleur
|
fc4aa96cd7
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/dispatch.php
|
2017-01-20 21:02:05 +01:00 |
|
Laurent Destailleur
|
7a0d388073
|
Fix if not defined, set default value from constant
|
2017-01-17 11:53:28 +01:00 |
|
Laurent Destailleur
|
9c60474953
|
FIX #6277
|
2017-01-16 11:06:17 +01:00 |
|
Laurent Destailleur
|
d14e4dbaba
|
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
|
2017-01-15 20:49:20 +01:00 |
|
Marcos García de La Fuente
|
d09a3628c5
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/compta/facture.php
|
2017-01-14 23:59:14 +01:00 |
|
Laurent Destailleur
|
b642a3a602
|
Prepare release 5.0
|
2016-12-31 16:35:56 +01:00 |
|
Marcos García de La Fuente
|
47a444b2ab
|
Merge branch 'develop' into prod-attr
|
2016-12-27 15:54:53 +01:00 |
|
Laurent Destailleur
|
82052450a6
|
Complete work on dol_banner
|
2016-12-26 18:21:18 +01:00 |
|
Marcos García de La Fuente
|
5669f734b8
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-12-24 21:39:40 +01:00 |
|
Laurent Destailleur
|
60b8582aa9
|
Fix more then 30 security defects
|
2016-12-18 01:44:26 +01:00 |
|
Laurent Destailleur
|
6c4f15df63
|
Fix lot of fix in css look to match v5 rules.
|
2016-12-11 16:11:42 +01:00 |
|
Maxime Kohlhaas
|
f7524b93ad
|
Actualize currency on supplier order and invoice
|
2016-12-11 02:50:21 +01:00 |
|
Maxime Kohlhaas
|
3d2143809b
|
Multicurrency on supplier order and invoice
|
2016-12-11 02:09:57 +01:00 |
|
Maxime Kohlhaas
|
707ca379c9
|
Fix currency on supplier order creation
|
2016-12-10 23:57:26 +01:00 |
|
Laurent Destailleur
|
bed23483d6
|
Merge pull request #6094 from benlo06/fix_list_fourn
Fix missing column in supplier list
|
2016-12-10 11:43:09 +01:00 |
|
Alexis Algoud
|
73f5254159
|
FIX #6031 search on login but fullname displayed
|
2016-12-10 11:35:34 +01:00 |
|
Laurent Destailleur
|
d5e417010f
|
Complete work on dol_banner
|
2016-12-09 11:16:04 +01:00 |
|
Benoit
|
9f51691ae4
|
Fix bug on fournisseur list
|
2016-12-09 00:15:59 +01:00 |
|
Laurent Destailleur
|
761a795294
|
Maxi debug on REST APIs
|
2016-12-05 13:31:29 +01:00 |
|
Laurent Destailleur
|
bd8f923cee
|
Several fixes in filter on lists
|
2016-11-29 22:52:16 +01:00 |
|
Laurent Destailleur
|
e59edca855
|
Fix Responsive design
|
2016-11-27 20:55:59 +01:00 |
|
Marcos García de La Fuente
|
cf0ee36150
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-11-27 18:10:01 +01:00 |
|
Laurent Destailleur
|
18a1f9033c
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/class/api_generic.class.php
htdocs/api/index.php
|
2016-11-27 16:25:38 +01:00 |
|
Laurent Destailleur
|
e4a8342aef
|
Fix div-table-form balance on all lists (solve responsive design)
|
2016-11-27 11:41:10 +01:00 |
|
Laurent Destailleur
|
16ce156631
|
Fix responsive design
|
2016-11-25 18:32:52 +01:00 |
|