lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,362 Commits 43 Branches 150 Tags 886 MiB
9.0
Commit Graph

16063 Commits

Author SHA1 Message Date
Ferran Marcet
32220dde2e FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES 2019-08-05 14:12:19 +02:00
Laurent Destailleur
cd0d5c41f5
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-08-01 16:37:40 +02:00
atm-arnaud
f64092a1e8 FIX order or proposals billed if both workflow conf activated 2019-08-01 11:00:49 +02:00
Laurent Destailleur
9baf21f492 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 22:03:13 +02:00
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
6b789a13a1
Merge pull request #11562 from atm-quentin/FIX_pdf_cheque 
FIX name was able to be in field but went back to new line
 2019-07-30 22:00:58 +02:00
Laurent Destailleur
ed7a57e3ef
Merge pull request #11571 from atm-john/9.0_fix_showOutputField 
Fix sellist showOuputField
 2019-07-30 21:40:37 +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
ATM john
581ae226ff Fix sellist showOuputField 2019-07-27 18:25:25 +02:00
atm-quentin
1f7cd1a3f8 FIX name was able to be in field but went back to new line 2019-07-26 11:05:16 +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
John Botella
200b66d11f Remove a backported fix because failling at init test 2019-06-21 14:52:12 +02:00
Laurent Destailleur
c725db166d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-21 11:26:44 +02:00
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
florian HENRY
0865bdb60f fix depending extrafeilds list 2019-06-20 12:16:48 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
Laurent Destailleur
20e00ca290 FIX if last char of customercode is accent making the truncate of first 
chars wrong.
 2019-06-18 19:41:16 +02:00
Laurent Destailleur
3e6b7208cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a Fix syntax error 2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:07:24 +02:00
Laurent Destailleur
1318e26cda
Merge pull request #11298 from hregis/7.0_price 
FIX missing compatibility with multicompany transverse mode
 2019-06-13 10:01:05 +02:00
Laurent Destailleur
4cbfb67d63
Update html.formother.class.php 2019-06-13 09:59:10 +02:00
Laurent Destailleur
4f5f03b893
Merge pull request #11326 from atm-greg/FIX_massaction_presend 
Fix massaction presend
 2019-06-12 12:37:03 +02:00
Laurent Destailleur
0bf7512f28
Update actions_massactions.inc.php 2019-06-12 12:33:31 +02:00
atm-greg
47746fd17d fix template type 2019-06-12 12:30:49 +02:00
atm-greg
9ba102b6b9 bad object used 2019-06-12 12:08:16 +02:00
atm-greg
25031e534d fix massaction presend 2019-06-12 12:05:02 +02:00
Laurent Destailleur
afe1ec633b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:21 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab FIX #11316 2019-06-12 10:05:53 +02:00
Maxime Kohlhaas
0ce2c2aab5 Fix missing massaction hook params 2019-06-10 10:11:26 +02:00
Laurent Destailleur
b36f80ab2e
Merge pull request #11306 from frederic34/patch-6 
Parameter must be array or object that implements Countable
 2019-06-07 18:10:03 +02:00
Laurent Destailleur
b73d287953
Update agenda.lib.php 2019-06-07 18:09:43 +02:00
Laurent Destailleur
4ed7e281c5
Merge pull request #11301 from frederic34/patch-5 
avoid warning with php 7.2
 2019-06-07 15:08:49 +02:00
Laurent Destailleur
3ff154c1d0 Fix sql error 2019-06-06 19:05:47 +02:00
Frédéric FRANCE
f11db8396a
Parameter must be array or object that implements Countable 
warning with php 7.2
 2019-06-06 09:49:32 +02:00
Frédéric FRANCE
ca6a624112
avoid warning with php 7.2 2019-06-05 13:55:47 +02:00
Regis Houssin
5726b40a10 FIX try to use WHERE EXISTS instead DISTINCT 2019-06-03 17:26:03 +02:00
Regis Houssin
7fd1051efc FIX missing compatibility with multicompany transverse mode 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-03 17:22:15 +02:00
Laurent Destailleur
fc37c393ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-02 12:36:48 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Maxime Kohlhaas
d47913ed19 Fix : add refclient on bulk invoicing 2019-05-31 16:33:32 +02:00
Maxime Kohlhaas
15fd24a511 Fix : remove hardcoded llx_ prefix 2019-05-31 12:14:51 +02:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
cd75794aaa FIX #11169 #11202 2019-05-31 11:38:54 +02:00
Laurent Destailleur
912e29a746 FIX #11244 2019-05-29 11:06:01 +02:00
Laurent Destailleur
3c05cfe690 Fix useless test 2019-05-29 10:50:33 +02:00
Laurent Destailleur
b46b675b7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-29 10:36:00 +02:00
Laurent Destailleur
a491de01b3
Merge pull request #11244 from altatof/8.0 
FIX : do not include tpl from disabled modules
 2019-05-29 10:35:39 +02:00
Laurent Destailleur
6e9cd819c1 Fix phpcs 2019-05-29 09:55:09 +02:00
Laurent Destailleur
1c6ddd25c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-27 19:23:54 +02:00
Laurent Destailleur
7db643fff0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-27 19:23:09 +02:00
Laurent Destailleur
93c395fe10 FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL 2019-05-27 19:22:51 +02:00
atm-ph
c79b9b9704 Fix create bills on mass action does not retrieve the original currency code 2019-05-27 11:18:29 +02:00
Laurent Destailleur
c04d082ad1 FIX Import of chart of account 2019-05-24 18:14:15 +02:00
Laurent Destailleur
49991eabf8 Fix import of accounting account from ref in import profiles 2019-05-24 17:09:18 +02:00
Laurent Destailleur
63824861a6 Fix import of chart of account. The account parent was not managed. 2019-05-24 16:58:06 +02:00
Christophe Battarel
83d883c36a finally eldy is always right 2019-05-24 15:14:34 +02:00
Christophe Battarel
4863ddcb00 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-24 15:13:23 +02:00
Laurent Destailleur
89455672a2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-24 14:58:21 +02:00
Christophe Battarel
545cdd0762 test include return on FALSE 2019-05-24 12:54:24 +02:00
Christophe Battarel
abc7c2f0f8 test include return on TRUE 2019-05-24 12:33:40 +02:00
Christophe Battarel
aaaad71347 FIX : do not include disabled modules tpl 2019-05-24 12:10:58 +02:00
Marc de Lima Lucio
49385fcab3 FIX: situation invoices: bad detailed VAT in situations following the first one 2019-05-23 14:37:40 +02:00
Laurent Destailleur
f99f1d83c2
Merge pull request #11229 from frederic34/patch-7 
target _blank depend of mime
 2019-05-21 22:42:36 +02:00
Laurent Destailleur
16f7d96ed1
Merge pull request #11231 from ATM-Marc/FIX_8.0_extrafields_search 
FIX: extrafield list search: SQL error when field is multiselect
 2019-05-21 22:38:14 +02:00
Laurent Destailleur
a7f5f3fb94 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea FIX Error management when MAILING_NO_USING_PHPMAIL is set 2019-05-21 21:16:06 +02:00
Marc de Lima Lucio
18a6ed17cf FIX: extrafield list search: SQL error when field is multiselect 2019-05-21 14:49:23 +02:00
Laurent Destailleur
f283e24b48 Fix the noexe must be added for dangerous extension like js and shells 2019-05-21 13:53:12 +02:00
Frédéric FRANCE
84781cabac
target _blank depend of mime 
target _blank is added in the previous line depending on mimtype
 2019-05-21 13:11:17 +02:00
Laurent Destailleur
ebf252f8a3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-20 15:40:50 +02:00
Laurent Destailleur
ea5ffbb0bf
Merge pull request #11216 from atm-florian/8.0 
fix:  #11187
 2019-05-19 02:19:12 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
florian HENRY
e4d87ab2e7 fix: #11189 2019-05-19 02:05:13 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-05-19 02:03:16 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
Maxime Kohlhaas
4f64250ad6 Fix menu links for holidays 2019-05-18 17:12:25 +02:00
Maxime Kohlhaas
6c195d7bdf Add warning delay for holidays 2019-05-18 17:07:29 +02:00
Laurent Destailleur
6c4a4c34c4 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-18 02:26:40 +02:00
Maxime Kohlhaas
095fd2769a Fix project beluga order status 2019-05-18 01:11:34 +02:00
ATM-Marc
b85ed3e0b7 FIX: mail presend: can overwrite a file previously uploaded 2019-05-18 00:11:15 +02:00
Maxime Kohlhaas
2a2f0557cf Fix : display hr tab on user if rights to read all 2019-05-17 17:07:38 +02:00
Laurent Destailleur
e2408fb54d
Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display 
fix useless calculation
 2019-05-13 20:20:01 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
atm-greg
644f247910 fix useless calculation 2019-05-13 12:02:46 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php 2019-05-13 12:00:13 +02:00
Laurent Destailleur
eed2b97913 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-10 17:40:53 +02:00
Laurent Destailleur
069df82380 FIX javascript error when ckeditor module not enabled 2019-05-10 17:40:34 +02:00
Juanjo Menent
e36df726a1 Merge remote-tracking branch 'upstream/9.0' into 9.0 2019-05-09 20:42:04 +02:00
Juanjo Menent
2b182c1cc1 FIX: #11097 2019-05-09 20:39:30 +02:00
Laurent Destailleur
1e970fa8d7
Merge pull request #11151 from atm-arnaud/FIX_linkedfiles_in_attached_files_was_broked 
FIX attached files list with link file was broked
 2019-05-09 15:05:51 +02:00
Laurent Destailleur
677b333d0a FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick 
hack to fix output pb).
 2019-05-09 12:38:00 +02:00