Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
115,678 Commits 36 Branches 189 Tags
f85c239e4f0482d96cfef1743494b51f00b90509
Commit Graph

6922 Commits

Author SHA1 Message Date
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-09 16:53:53 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Gauthier PC portable 024
5daca35e79 FIX : new tables loading system 2022-05-09 12:33:39 +02:00
Laurent Destailleur
b3b6337c4c Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
30597d7f89 Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project 
NEW: Separate read-only and adding time on projects
 2022-05-08 19:50:46 +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
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
Florian HENRY
9192596ec3 merge 2022-05-06 11:17:29 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Laurent Destailleur
f256207cd5 Save logs 2022-05-03 23:54:40 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-05-03 13:05:51 +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
6aa32e7c70 Retrograde intracommreport from experimental to dev 2022-05-02 20:21:58 +02:00
Hystepik
0be15e3c74 Merge branch 'develop' into develop#6 2022-05-02 15:16:15 +02:00
lmarcouiller
13e05b875d remove unused files 2022-05-02 15:07:41 +02:00
Laurent Destailleur
21e3a5d5ec Try to fix warnings 2022-05-01 21:04:16 +02:00
Laurent Destailleur
d7398f573c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-01 20:49:43 +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
fe2324ac7e Merge pull request #20669 from ymollard/tickets-collector 
FIX and NEW i18n for creating tickets via the mail collector
 2022-05-01 12:36:16 +02:00
Laurent Destailleur
96519d2a3b Merge pull request #20758 from ns-info90/develop 
Warehouse pdf generation issue #20632
 2022-05-01 12:16:02 +02:00
Laurent Destailleur
477d681c49 Fix warnings 2022-04-30 17:47:45 +02:00
Laurent Destailleur
7b8e08bbf6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-30 17:28:55 +02:00
stickler-ci
e4d311216a Fixing style errors. 2022-04-30 01:13:45 +00:00
Nicolas SILOBRE
1b0b672892 Warehouse pdf generation issue #20632 
Update of the PDF
Correction of page headers > 1
Added frames
Blackening of texts
Extended footer alignment
 2022-04-30 03:02:22 +02:00
Laurent Destailleur
89d8fdde8d Fix phpcs 2022-04-29 19:31:59 +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
3fb081a2fc Update contacts1.modules.php 2022-04-29 17:57:55 +02:00
Laurent Destailleur
d98637c113 Merge branch 'develop' into cleanMailingLanguageSupport 2022-04-29 17:56:56 +02:00
Laurent Destailleur
801f0e62f7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-29 17:37:01 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +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
Laurent Destailleur
6ed0bb2924 Merge pull request #20697 from ns-info90/develop 
Update pdf_rouget.modules.php #20142
 2022-04-29 17:22:40 +02:00
Laurent Destailleur
d496ad65e6 Enhance the feature of keyword detection for partnership 2022-04-29 11:16:15 +02:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00
lmarcouiller
8629651659 NEW : module webhook 2022-04-28 11:13:21 +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
Nicolas SILOBRE
5eb74772d6 Update pdf_rouget.modules.php 
Correction of units in the total weight
 2022-04-23 03:41:17 +02:00
stickler-ci
9fd3a4b2c9 Fixing style errors. 2022-04-22 13:30:43 +00:00
Eric Seigne
72ac1fdfd2 fix #20690: add lang filter for companies 2022-04-22 15:28:48 +02:00
Eric Seigne
d2ec1efb42 fix #20690: add lang filter for people 2022-04-22 15:28:36 +02:00
Regis Houssin
2a5c54d4e4 FIX compatibility for ticket number sharing 2022-04-21 16:02:41 +02:00
Regis Houssin
8878eb6d76 FIX compatibility with multicompany sharings 2022-04-21 14:52:06 +02:00
stickler-ci
aa36e396a3 Fixing style errors. 2022-04-18 22:23:44 +00:00
Yoan Mollard
bf5076e181 set MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER to TRUE by default 
This is way more readable
 2022-04-19 00:13:40 +02:00