Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
107,294 Commits 36 Branches 189 Tags
118b975f918fb580278727948008fa2f331ecbe2
Commit Graph

6240 Commits

Author SHA1 Message Date
Laurent Destailleur
118b975f91 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 11:56:05 +02:00
Laurent Destailleur
bf4f6ce0a9 Merge branch '14.0' into 14p38 2022-09-24 19:37:14 +02:00
Laurent Destailleur
9fa43a3bfe Picto are lowercase 2022-09-24 19:36:14 +02:00
Laurent Destailleur
38410daaf2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-23 18:37:00 +02:00
Laurent Destailleur
194d7a2110 Update modAccounting.class.php 2022-09-23 17:26:28 +02:00
Alexandre SPANGARO
3fdd34400f FIX #22265 Accountancy - Account number expected in place of a rowid on export 2022-09-23 05:12:21 +02:00
ksar
4906aaf1f6 FIX : ToOfferALinkForOnlinePayment not translated 
Link to #22248
I forgot to do it on Crabe also.
 2022-09-16 11:43:17 +02:00
Alexandre SPANGARO
7124b5bf75 FIX #22264 Accountancy - Translation on chart of accounts export 2022-09-14 05:16:50 +02:00
ksar
77ec9ee669 FIX : ToOfferALinkForOnlinePayment not translated 
ToOfferALinkForOnlinePayment is defined on stripe.lang
 2022-09-13 11:26:37 +02:00
Laurent Destailleur
64beee3396 FIX the shipment PDF was using the full size logo instead of small 2022-09-08 22:04:29 +02:00
stickler-ci
46dab68dd0 Fixing style errors. 2022-09-05 13:56:41 +00:00
ksar
3e1e37211b Update mod_codeclient_elephant.php 2022-09-05 15:48:40 +02:00
Laurent Destailleur
0d9e595f0e Fix profile to export categories 2022-09-02 19:43:48 +02:00
Günter Lukas
0f6effcdb0 Update import_xlsx.modules.php 2022-08-07 14:43:26 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
50af2747a2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-22 17:35:03 +02:00
Laurent Destailleur
346a716ad4 Merge pull request #21530 from noec764/14.0_Fix_MissingTabHelp 
Fix: tabhelp must be present in every module. Related to  #21529
 2022-07-19 19:01:21 +02:00
Noé Courtier
2aae7525da Fix: tabhelp must be present in every module 2022-07-19 17:27:15 +02:00
Noé Courtier
276168ef6f Fix: tabhelp must be present in every module 2022-07-19 17:14:57 +02:00
Laurent Destailleur
3d226801ba Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:22:02 +02:00
Laurent Destailleur
52661e09c7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/modResource.class.php
 2022-07-10 19:18:59 +02:00
jpb
f10788e4c6 fix export resource type filter 2022-07-07 10:24:39 +02:00
Laurent Destailleur
8075a40bd9 FIX #21323 2022-06-22 18:12:36 +02:00
Laurent Destailleur
3a1c8206f1 Merge pull request #21203 from fboitel/fix#21093 
FIX#21093
 2022-06-12 11:48:14 +02:00
Faustin
71ef074987 FIX#21093 2022-06-11 00:41:15 +02:00
Faustin
ef959ecddd FIX#21093 2022-06-11 00:18:38 +02:00
Laurent Destailleur
7ee4cccc84 FIX ODT tags for subobjects {object_subobject_yyy} was not working. 2022-06-07 19:59:33 +02:00
Laurent Destailleur
6f6d7d7f48 Fix ODT tags in BOM template 
Conflicts:
	htdocs/core/class/commonobjectline.class.php
 2022-06-02 20:18:11 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
 2022-05-24 16:31:45 +02:00
Maxime Kohlhaas
e5c38572d1 Fix no document available on job candidature 2022-05-22 00:23:16 +02:00
Maxime Kohlhaas
bf39a259ba Fix PDF watermark over PDF text 2022-05-22 00:05:03 +02:00
Laurent Destailleur
980c9874ab Merge pull request #20895 from ATM-Consulting/FIX_15.0_unable_to_add_several_cron_jobs_with_same_method_and_different_parameters 
FIX 15.0: modules cannot declare more than 1 cron job using the same method with different parameters
 2022-05-21 01:17:28 +02:00
Laurent Destailleur
fffd655442 Merge pull request #20933 from atm-maxime/fix_recruitment_missing_const 
Fix missing const in recruitment module
 2022-05-21 00:24:01 +02:00
Laurent Destailleur
ee6131612a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-20 23:28:01 +02:00
Maxime Kohlhaas
bba6a917cb Fix missing const in recruitment module 2022-05-20 23:21:08 +02:00
atm-florian
0bf588962b FIX 15.0: modules cannot declare more than 1 cron job using the same method with different parameters 2022-05-19 09:45:37 +02:00
lvessiller
978db41f37 FIX qty received label in Squille PDF model 2022-05-17 15:50:45 +02:00
Laurent Destailleur
90c95bc638 Merge pull request #20610 from hregis/fix_missng_signature_library 
FIX missing signature library when ODT model is used
 2022-05-08 19:36:06 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
 2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules 
Trans debugbar
 2022-05-03 12:08:24 +02:00
Laurent Destailleur
6308b700d5 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-05-01 20:47:54 +02:00
Laurent Destailleur
e5aa4afabd Merge pull request #20683 from hregis/fix_missing_getentity 
FIX compatibility with multicompany sharings
 2022-04-29 18:35:26 +02:00
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
 2022-04-29 17:32:28 +02:00
Laurent Destailleur
17a2aa8f1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2022-04-29 17:27:12 +02:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00
Florian HENRY
3d4bd1e155 FIX: truncate Customer Reference too long on PDF header (PR #20718) 2022-04-26 16:53:40 +02:00
Florian HENRY
399addfb03 mor docs 2022-04-26 16:40:27 +02:00
Florian HENRY
c00a56bee3 fix: truncate too long Ref Customer in PDF Header 2022-04-26 16:39:06 +02:00
Regis Houssin
2a5c54d4e4 FIX compatibility for ticket number sharing 2022-04-21 16:02:41 +02:00