Laurent Destailleur
|
754ed1b93b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
|
2019-07-30 22:03:02 +02:00 |
|
Laurent Destailleur
|
9a87e27176
|
Merge pull request #11566 from atm-florianm/FIX_workflow_amount_comparison_fails_due_to_floating_point_val_precision_arithmetic_drift
FIX: floating point precision errors in the triggers of the workflow module
|
2019-07-30 21:23:43 +02:00 |
|
Laurent Destailleur
|
fe8ced58c8
|
Update interface_20_modWorkflow_WorkflowManager.class.php
|
2019-07-30 21:19:33 +02:00 |
|
Laurent Destailleur
|
5f2439bf0a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-07-30 20:37:44 +02:00 |
|
Marc de Lima Lucio
|
703506c0e2
|
FIX: import filter error
|
2019-07-30 14:11:21 +02:00 |
|
Marc de Lima Lucio
|
449ef92007
|
FIX: categories import: prevent mismatch between category type and object type
|
2019-07-30 12:31:03 +02:00 |
|
Florian Mortgat
|
858e8a826f
|
FIX: use rounding to compare the amounts
|
2019-07-29 09:47:28 +02:00 |
|
Laurent Destailleur
|
0d79905b0a
|
Merge pull request #11539 from hregis/9.0_bug2
FIX duplicate on the check (TODO field $onetrtd not used ?)
|
2019-07-25 17:56:42 +02:00 |
|
Laurent Destailleur
|
8241bc414a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2019-07-25 17:52:17 +02:00 |
|
Laurent Destailleur
|
fe9ddd7649
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2019-07-25 17:50:07 +02:00 |
|
Florian Mortgat
|
65e9d8f239
|
FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined)
|
2019-07-25 11:14:59 +02:00 |
|
atm-josselin
|
0a1f4b7931
|
FIX : correct error in files with multiple spaces
|
2019-07-23 09:45:17 +02:00 |
|
Laurent Destailleur
|
5dcf4d6646
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-07-22 19:06:48 +02:00 |
|
Laurent Destailleur
|
b4e0c5ef6c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-07-22 18:51:32 +02:00 |
|
Regis Houssin
|
6409cc06ae
|
FIX duplicate on the check (TODO field $onetrtd not used ?)
|
2019-07-22 11:44:56 +02:00 |
|
Florian Mortgat
|
b100cdb9db
|
FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set.
|
2019-07-19 11:58:21 +02:00 |
|
Laurent Destailleur
|
5e204f0f67
|
Merge
|
2019-07-18 17:51:32 +02:00 |
|
Laurent Destailleur
|
b044d95acf
|
Merge
|
2019-07-18 17:50:15 +02:00 |
|
Laurent Destailleur
|
5d74c81941
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-07-15 23:48:40 +02:00 |
|
Laurent Destailleur
|
d694360c66
|
Fix warning
|
2019-07-15 23:46:54 +02:00 |
|
Regis Houssin
|
294bc5dcb5
|
FIX avoid conflict with "$classname" in card.php
|
2019-07-15 10:19: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
|
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
|
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 |
|
Nicolas ZABOURI
|
abd0abf115
|
FIX element name in update_price
|
2019-07-10 18:36:12 +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 |
|
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
|
63c93be94e
|
Update html.form.class.php
|
2019-07-04 12:20:34 +02:00 |
|
atm-greg
|
2f5b9ccb22
|
fix case objecttmp is an invoice
|
2019-07-03 17:00:18 +02:00 |
|
Laurent Destailleur
|
9d50c67208
|
FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export
|
2019-07-02 18:06:51 +02:00 |
|
atm-quentin
|
49db277368
|
FIX ending slash
|
2019-06-26 16:42:14 +02:00 |
|
Laurent Destailleur
|
d5479cd9ae
|
Fix import of ledger
|
2019-06-25 22:37:13 +02:00 |
|
Laurent Destailleur
|
20471c54e1
|
Fix import code (regex of data imported + import of constant)
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
|
2019-06-25 22:27:00 +02:00 |
|
Laurent Destailleur
|
d41850c7cd
|
Fix purge of old files
|
2019-06-25 20:02:14 +02:00 |
|
Laurent Destailleur
|
4696d35bcb
|
Fix we need to keep temp dir
|
2019-06-25 19:02:24 +02:00 |
|
Laurent Destailleur
|
d85ec982e5
|
Fix do not output log in arhived log for draft documents
|
2019-06-24 23:39:44 +02:00 |
|
Laurent Destailleur
|
ae1ad80994
|
Fix count
|
2019-06-24 16:32:42 +02:00 |
|
Laurent Destailleur
|
70f19b3a3d
|
Fix counter of record
|
2019-06-24 16:31:56 +02:00 |
|
Laurent Destailleur
|
b98874848f
|
Fix backport 9.0
|
2019-06-24 16:12:54 +02:00 |
|
Laurent Destailleur
|
84575df7e6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-06-24 16:12:29 +02:00 |
|
Laurent Destailleur
|
3d185b6818
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
|
2019-06-24 16:12:20 +02:00 |
|
Laurent Destailleur
|
3c4956838e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
|
2019-06-24 15:44:44 +02:00 |
|
Laurent Destailleur
|
04606ec6a3
|
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail
FIX mass send mail
|
2019-06-24 15:34:06 +02:00 |
|
Laurent Destailleur
|
7e10208619
|
Merge pull request #11380 from atm-florian/9.0
fix depending extrafeilds list
|
2019-06-24 15:23:48 +02:00 |
|
John Botella
|
ec7ebe9f39
|
redo backported fix and update adherent substitution methode
|
2019-06-21 15:32:38 +02:00 |
|