Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
94,306 Commits 36 Branches 189 Tags
f95bd2f4396f9f159c1e872b96a16f7a84ebd92c
Commit Graph

8939 Commits

Author SHA1 Message Date
Laurent Destailleur
f84817f0f6 FIX rss module on servers with allow_url_fopen=0 2021-05-11 23:49:33 +02:00
Laurent Destailleur
c3b5491805 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:36 +02:00
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
33a20ae9a1 Update extrafields.class.php 2021-05-03 16:16:44 +02:00
ATM john
6e4962bb39 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection 2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8 Fix checkbox multiselect pre-selected value from get/post 2021-04-30 12:20:43 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
f66c506011 Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options 
Add parameter "option" to hook formattachOptions
 2021-04-26 21:00:12 +02:00
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Robin
0839ee25cd FIX missing parameter in select for POP 
All options can be modified for selector in pop
 2021-04-13 10:44:14 +02:00
Laurent Destailleur
4b1974080a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Gauthier PC portable 024
c35c15e782 FIX : test must be === and not == 2021-04-09 11:31:50 +02:00
Günter Lukas
04a55a3df3 Fix #17146 2021-04-07 09:08:34 +02:00
Florian Mortgat
f5617a6247 FIX 13.0 warning - missing quotes around 'label' 2021-04-01 12:33:23 +02:00
Laurent Destailleur
89dbd745bf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/modAccounting.class.php
 2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +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
daraelmin
6ba878725e Fix #16794 V13 order by status instead of statut 2021-03-22 07:28:16 +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
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
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
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +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
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Florian HENRY
2c163b8163 fix #16510 2021-03-02 15:22:22 +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
Laurent Destailleur
3982a36a3e Update commonobject.class.php 2021-03-02 14:47:35 +01:00
Florian HENRY
27c354567a FIX : select list dependencies now work for ModuleBuilder sellist field 2021-03-02 14:06:11 +01:00
Laurent Destailleur
1132ed306c Merge pull request #16506 from andreubisquerra/patch-1 
Avoid php errors if negative var in Receipt Module
 2021-03-02 12:50:57 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
andreubisquerra
5bb7c521aa Update dolreceiptprinter.class.php 2021-03-01 23:30:38 +01:00
andreubisquerra
15cc0f8775 Avoid php errors if negative var in Receipt Module 
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
 2021-03-01 23:09:07 +01:00
Alexandre SPANGARO
0d954cb1c7 FIX: Total_ht not show in contract link element 2021-03-01 03:09:36 +01:00
Alexandre SPANGARO
de241eced3 FIX: Total_ht not show in contract link element 2021-02-28 22:22:20 +01:00
Laurent Destailleur
2a3b3753a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-28 13:27:38 +01:00
Laurent Destailleur
3a19cbb062 FIX #16420 #16423 #16488 #16477 2021-02-28 12:47:24 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00