Commit Graph

72878 Commits

Author SHA1 Message Date
Florian Mortgat
dbd68027f8 New script that links "orphaned" dispatch lines to order lines
(the "orphans" are dispatch lines that were created in old versions of Dolibarr which didn’t have fk_commandefourndet in llx_commande_fournisseur_dispatch)
2019-07-18 17:03:16 +02:00
Florian Mortgat
e404069d26 Revert "FIX: calculation of $products_dispatched"
This reverts commit 75ae611f9e.
2019-07-18 17:00:57 +02:00
Florian Mortgat
770b419769 Revert "FIX: wrong display (and hidden input) for already dispatched quantity"
This reverts commit b155fdc014.
2019-07-18 17:00:46 +02:00
Florian Mortgat
b155fdc014 FIX: wrong display (and hidden input) for already dispatched quantity 2019-07-15 12:00:06 +02:00
atm-florian.m
75ae611f9e FIX: calculation of $products_dispatched
After the DB retrieval method was changed from fetch_row to fetch_object, the indices used became wrong.
2019-07-15 12:00:06 +02:00
Laurent Destailleur
3bfc1938d3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85 Fix save of doc template for recuring invoices. 2019-07-14 00:10:15 +02:00
Laurent Destailleur
8090a8abb6 Fix param [] -> null 2019-07-14 00:07:27 +02:00
Laurent Destailleur
39e77dbdc6
Merge pull request #11461 from ATM-Nicolas/fix_template_invoice_edit_modelpdf
FIX : We must save code instead of value in database…
2019-07-14 00:19:13 +03:00
Laurent Destailleur
5ccb397af9
Merge pull request #11473 from hregis/9.0_security
FIX better compatibility with multicompany transverse mode
2019-07-13 23:42:36 +03:00
Laurent Destailleur
f285bed2ff
Merge pull request #11479 from atm-gauthier/8.0_fix_report_by_tva
FIX : accounting mode must be taken from global conf, because there's…
2019-07-13 23:40:15 +03:00
Laurent Destailleur
b6571d9fc3
Update byratecountry.php 2019-07-13 22:39:25 +02:00
Laurent Destailleur
edd51bb150
Merge pull request #11469 from atm-maxime/fix_prelevement_rum
Fix : use RUM if defined in bank account
2019-07-13 23:34:31 +03:00
Laurent Destailleur
f34d96b5fb
Merge pull request #11475 from atm-lena/9.0_fix_help_text
FIX help text
2019-07-13 23:32:35 +03:00
Laurent Destailleur
4dabdfa5ac
Merge pull request #11483 from inoveaconseil/FIX_update_price
FIX element name in update_price
2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e
Update commonobject.class.php 2019-07-13 22:29:50 +02:00
Laurent Destailleur
db2e1d88a3
Merge pull request #11499 from hregis/9.0_bug2
FIX __INFOS__ tag not exists
2019-07-13 22:48:05 +03:00
Regis Houssin
332abd2a9f FIX __INFOS__ tag not exists 2019-07-13 11:02:45 +02:00
Nicolas ZABOURI
abd0abf115 FIX element name in update_price 2019-07-10 18:36:12 +02:00
gauthier
cce8f98afc FIX : accounting mode must be taken from global conf, because there's no way to choose a mode with interface 2019-07-10 16:33:03 +02:00
atm-lena
a3f5397988 FIX help text 2 2019-07-10 15:55:50 +02:00
atm-lena
cebf81a514 FIX helpp text 2019-07-10 15:18:25 +02:00
Regis Houssin
41b004c2b8 FIX better compatibility with multicompany transverse mode 2019-07-10 12:16:32 +02:00
Maxime Kohlhaas
0aa42fefae Fix : use RUM if defined in bank account 2019-07-09 18:13:11 +02:00
ATM-Nicolas
3d076d8bf9 FIX : We must save code instead of value in database for template invoice modelpdf 2019-07-05 11:16:12 +02:00
Laurent Destailleur
8b0b824471 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-04 12:22:48 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/comm/action/card.php
2019-07-04 12:22:40 +02:00
Laurent Destailleur
f8de11492e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:25 +02:00
Laurent Destailleur
bc309ace38 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:16 +02:00
Laurent Destailleur
d04b19549e
Merge pull request #11453 from atm-greg/FIX_9.0_selectForFormsList_for_invoices
fix case objecttmp is an invoice in selectForFormsList
2019-07-04 12:20:56 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php 2019-07-04 12:20:34 +02:00
Laurent Destailleur
a9dfca70cf
Merge pull request #11452 from atm-florianm/FIX_minor_spelling_issues
FIX: minor spelling issues
2019-07-04 12:19:26 +02:00
Laurent Destailleur
554c76e232
Merge pull request #11451 from fmarcet/8.0
FIX: When saving an action it didn't save the label based on the type of event
2019-07-04 12:18:08 +02:00
Laurent Destailleur
125c2a65c0
Merge pull request #11445 from atm-john/9.0_fix_dictionary
Fix missing hidden input and short label
2019-07-04 10:54:16 +02:00
Laurent Destailleur
2035cbaee1
Merge pull request #11440 from atm-maxime/7.0
Fix wrong column for filters on invoice template list
2019-07-04 10:46:49 +02:00
Laurent Destailleur
5fde7da183
Merge pull request #11439 from atm-quentin/FIX_empty_product_use_units
FIX empty product_use_units in product configuration
2019-07-04 10:38:15 +02:00
atm-greg
2f5b9ccb22 fix case objecttmp is an invoice 2019-07-03 17:00:18 +02:00
atm-florian.m
3e53a06b2e minor spelling issues 2019-07-03 16:17:47 +02:00
Ferran Marcet
433835860c FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized 2019-07-03 13:12:41 +02:00
Laurent Destailleur
9d50c67208 FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export 2019-07-02 18:06:51 +02:00
John Botella
a75a2ae8e4 Fix missing hidden input and short label 2019-07-02 15:44:42 +02:00
Maxime Kohlhaas
6b43c325c7 Fix wrong column for filters on invoice template list 2019-07-02 10:53:47 +02:00
atm-quentin
8cdb251ca5 FIX product_use_units was set to 0 each time a conf in block other was set 2019-07-02 10:18:03 +02:00
Laurent Destailleur
ef27e32f53 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/filefunc.inc.php
2019-07-01 13:27:57 +02:00
Laurent Destailleur
3abaecfd77 Prepare 8.0.7 2019-07-01 13:27:18 +02:00
Laurent Destailleur
6537faa35e Fix merge 2019-06-29 23:26:14 +02:00
Laurent Destailleur
0aeb27ba97 Fix merge 2019-06-29 23:25:07 +02:00
Laurent Destailleur
fb42333b3e Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-06-29 23:20:07 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
fdc958a172 Fix launch of ISCC.ex if not into path 2019-06-29 23:17:36 +02:00