Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,117 Commits 36 Branches 189 Tags
950d9cb1585ca324d2b9ca31fcd54ee59366ea62
Commit Graph

7080 Commits

Author SHA1 Message Date
Laurent Destailleur
8075a40bd9 FIX #21323 2022-06-22 18:12:36 +02:00
Laurent Destailleur
e698d20789 Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
Frédéric France
889856d55f use getDolGlobalString 2022-06-21 23:39:31 +02:00
stickler-ci
5d1cae173e Fixing style errors. 2022-06-20 14:06:25 +00:00
BENKE Charlene
c4793e71c7 expedition setting php v8 warning 2022-06-20 15:55:52 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
Laurent Destailleur
3e34c2cab2 Doc 2022-06-18 21:20:50 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-06-17 14:52:51 +02:00
Hystepik
45439e055c Merge branch 'develop' into develop#6 2022-06-17 11:05:12 +02:00
Laurent Destailleur
25ecbe3401 Debug v16 2022-06-15 03:26:27 +02:00
Laurent Destailleur
55383bb032 Merge pull request #21267 from fboitel/fboitel-dev-scrutinizer-011 
BUG FIX pays_code has become country_code on commonObject
 2022-06-14 20:55:21 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Faustin
8cce63fae3 BUG FIX pays_code has become country_code on commonObject 2022-06-14 13:59:56 +02:00
Laurent Destailleur
e0066e9d2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-12 20:33:18 +02:00
Laurent Destailleur
89d135288b Doc 2022-06-12 20:33:10 +02:00
Laurent Destailleur
9aa48df111 Merge pull request #19566 from vincentjdc/customer-invoices-import 
Adds import for customer invoices and invoices lines
 2022-06-12 20:32:43 +02:00
Laurent Destailleur
c2fe5de852 Merge pull request #21195 from frederic34/useismodenabled 
use isModEnabled function
 2022-06-12 11:56:31 +02:00
Laurent Destailleur
3a1c8206f1 Merge pull request #21203 from fboitel/fix#21093 
FIX#21093
 2022-06-12 11:48:14 +02:00
Laurent Destailleur
a62b5a10fe Doygen 2022-06-11 22:01:10 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +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
Frédéric FRANCE
38b18a68d7 Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
b5a1ded537 Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Laurent Destailleur
604855bbc1 Debug v16 2022-06-09 02:05:20 +02:00
lmarcouiller
c257f32559 add of names in update 2022-06-08 13:35:32 +02:00
lmarcouiller
c368ff69df New : add of socialmedias in contact update 2022-06-08 12:36:55 +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
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
3d80cb9b66 Debug emailcollector 2022-06-03 12:29:47 +02:00
Laurent Destailleur
41ce28996c PHP 8.1 #21121 2022-06-03 11:10:08 +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
69a7b01f20 Fix ODT tags in BOM template 2022-06-02 20:15:49 +02:00
Laurent Destailleur
c88ee425ad Merge pull request #21087 from Hystepik/develop#3 
New : update in import for socialnetworks
 2022-06-01 19:40:54 +02:00
Laurent Destailleur
3dcd9fcfe9 Merge pull request #21086 from Hystepik/develop#2 
Fix: import update on xlsx
 2022-06-01 19:40:08 +02:00
Laurent Destailleur
e3fa24fab2 Merge pull request #18283 from atm-gauthier/NEW_stockstransfers 
NEW : Stocks transfers objects management
 2022-06-01 14:49:21 +02:00
Gauthier PC portable 024
2a3f0affaf FIX : try for travis 2022-06-01 14:13:24 +02:00
lmarcouiller
69e8c1abe4 New : update in import for socialnetworks 2022-06-01 11:44:07 +02:00
lmarcouiller
d345957b84 Fix: import update on xlsx 2022-06-01 11:36:47 +02:00
Laurent Destailleur
21e5189e18 Add phpunit for num2Alpha 2022-05-31 18:17:43 +02:00
Laurent Destailleur
a253938db9 Better error message 2022-05-31 18:08:53 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Gauthier PC portable 024
8b4054f8e9 FIX : missing phpcs:enable 2022-05-30 17:22:25 +02:00
Laurent Destailleur
0dda1d7e76 Merge pull request #20814 from atm-gauthier/NEW/develop_update_on_categorie_product_link_table 
New/develop update on categorie product link table
 2022-05-29 11:30:26 +02:00
Laurent Destailleur
480452e291 FIX missing filters 2022-05-29 10:35:49 +02:00
Laurent Destailleur
f6ad688ddd FIX module for emailing target selection must use a condition on module 2022-05-28 20:50:24 +02:00