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

22756 Commits

Author SHA1 Message Date
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
a4aa806e44
Merge pull request #16933 from daraelmin/daraelmin-patch-2 
Fix #16794 V13 order by status instead of statut
 2021-03-25 08:31:44 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +01:00
Laurent Destailleur
af593099df Clean string 2021-03-22 23:52:14 +01:00
daraelmin
6ba878725e
Fix #16794 V13 order by status instead of statut 2021-03-22 07:28:16 +01:00
Laurent Destailleur
861a5becf1
Merge pull request #16884 from daraelmin/daraelmin-patch-3 
#Fix #16767 v13 unremovable attached file in mailmodel
 2021-03-20 19:51:07 +01:00
daraelmin
2d7f858c1a
#Fix #16767 unremovable attached file in mailmodel 
#Fix #16767 unremovable attached file in mailmodel
 2021-03-20 14:04:20 +01:00
Florian HENRY
df4a243f18 fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature 2021-03-18 17:13:34 +01:00
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
 2021-03-16 14:50:06 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant 2021-03-12 13:14:53 +01:00
Regis Houssin
5375add08c FIX just add mp4 2021-03-12 08:41:56 +01:00
Regis Houssin
290f49a3e0 FIX wrong extension 2021-03-12 08:39:36 +01:00
Regis Houssin
05532ca6b7 FIX missing video mime 2021-03-12 08:35:13 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
9cb4dce485 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing 2021-03-09 16:12:30 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
ksar
ec8baa6bff Update commondocgenerator.class.php 
#16341
 2021-03-08 10:00:19 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0 
fix: set class attribute at right place
 2021-03-06 11:18:02 +01:00
Laurent Destailleur
98c7814fa3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
Laurent Destailleur
1cd822bd75 Fix DOS attack on emailings wrappers 2021-03-05 14:54:17 +01:00
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0 
avoid warning into modulebuilder
 2021-03-04 16:52:47 +01:00
Laurent Destailleur
dcff298c5f FIX #16533 2021-03-04 15:57:03 +01:00
Laurent Destailleur
98eb0fc969 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-04 15:34:44 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
atm-greg
c41b59b14c Fix : when we have got models in database attached files are cleared even if we did not have selected a model 2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0 Fix: lost selecteds items in ticket creation 2021-03-04 11:50:46 +01:00
Laurent Destailleur
7bc2e1ffad FIX Timezone management for datetime with modulebuilder and extrafields 2021-03-04 10:31:31 +01:00
Florian HENRY
bf775855f6 avoid warning into modulebuilder 2021-03-04 10:28:41 +01:00
Laurent Destailleur
5553bae3a1 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:44:01 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Laurent Destailleur
da8b67da83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-03 12:07:42 +01:00
Laurent Destailleur
093eab188e Code comment 2021-03-03 12:02:57 +01:00
Laurent Destailleur
6fcec3e99b
Merge pull request #16522 from FHenry/13.0 
fix: warning on install
 2021-03-02 23:58:26 +01:00
Laurent Destailleur
c2f0d9f42c
Update functions.lib.php 2021-03-02 23:57:37 +01:00
Florian HENRY
4e5849e50b remove debug 2021-03-02 23:13:05 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1 fix warning 2021-03-02 22:55:43 +01:00
Laurent Destailleur
8fc89b9ef1
Merge pull request #16511 from FHenry/13.0 
fix #16510 (missing ($this->) in previous PR
 2021-03-02 15:49:13 +01:00
Florian HENRY
373d52a562 Merge remote-tracking branch 'origin/13.0' into 13.0 2021-03-02 15:33:38 +01:00
Laurent Destailleur
a82ad6a02c Fix phpcs 2021-03-02 15:29:27 +01:00
Florian HENRY
2c163b8163 fix #16510 2021-03-02 15:22:22 +01:00
Laurent Destailleur
495c61c231 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-03-02 15:12:41 +01:00
Laurent Destailleur
5fd341bbd3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2021-03-02 15:11:18 +01:00
Laurent Destailleur
1f25f2bb7e Fix phpcs 2021-03-02 15:09:29 +01:00
Laurent Destailleur
cdfb9254b3
Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields 
FIX : select list dependencies now work for ModuleBuilder sellist field
 2021-03-02 14:51:53 +01:00