Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
103,106 Commits 36 Branches 189 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

6485 Commits

Author SHA1 Message Date
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
NextGestion
d6e4cb7d0b Merge branch 'develop' into dolibarr_partnership 2021-04-09 12:01:44 +01:00
Laurent Destailleur
0864daf2ad Merge pull request #17189 from altairisfr/wh_project 
add fk_project to warehouse table
 2021-04-09 11:49:08 +02:00
Laurent Destailleur
d098bf412d Move directory to match the one of composer package for phpspreadsheet 2021-04-08 17:35:52 +02:00
Christophe Battarel
4f413ca983 add fk_project to warehouse table 2021-04-08 16:46:52 +02:00
Laurent Destailleur
385053f107 Merge pull request #17158 from dolibit-ut/patch-239 
Update llx_20_c_departements.sql
 2021-04-08 15:34:48 +02:00
UT from dolibit
f609d03acc Update llx_20_c_departements.sql 
Chile
 2021-04-08 15:24:59 +02:00
UT from dolibit
539c29b05f Update llx_10_c_regions.sql 
Chile
 2021-04-08 14:38:43 +02:00
NextGestion
ace958240d Merge branch 'develop' into dolibarr_partnership 2021-04-07 12:30:37 +01:00
UT from dolibit
efb88936fd Update llx_10_c_regions.sql 
Greece
 2021-04-07 12:49:52 +02:00
UT from dolibit
9997ac59c7 Update llx_20_c_departements.sql 
Honduras Departamentos
 2021-04-07 12:38:49 +02:00
Laurent Destailleur
fcc6431896 Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Laurent Destailleur
dbc1780817 Merge pull request #16376 from aspangaro/14a22 
Code enhanced - Standardize field name #14697
 2021-04-06 20:01:38 +02:00
Laurent Destailleur
435b47631d Merge pull request #17126 from dolibit-ut/patch-229 
Update llx_20_c_departements.sql
 2021-04-06 19:32:36 +02:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
UT from dolibit
5c01b126a4 Update llx_20_c_departements.sql 
Luxembourg
 2021-04-05 20:01:05 +02:00
UT from dolibit
52ef2fefd4 Update llx_10_c_regions.sql 
France
Germany
 2021-04-05 19:47:12 +02:00
NextGestion
6da2c47360 Add template email for cancel partnership 2021-04-05 18:13:51 +01:00
Laurent Destailleur
685c880e6c Debug module workstation 2021-04-05 14:56:47 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
d0abcf594c Merge branch 'develop' into patch-422 2021-04-04 01:38:17 +02:00
Laurent Destailleur
e0e883b791 Merge pull request #17105 from dolibit-ut/patch-224 
Update llx_20_c_departements.sql
 2021-04-04 01:19:40 +02:00
UT from dolibit
44b8ea2b5f Update llx_20_c_departements.sql 
Colombia Departamentos
 2021-04-03 17:38:31 +02:00
UT from dolibit
bf59287770 Update llx_10_c_regions.sql 2021-04-03 17:19:16 +02:00
Youvious
5e9ce734a7 Clean llx_accounting_account_be.sql of all 'PRODUCT' and 'SERVICE' (pcg_subtype) 2021-04-03 15:14:33 +02:00
NextGestion
21f86c05d4 Merge branch 'develop' into dolibarr_partnership 2021-04-03 09:44:21 +01:00
ptibogxiv
52bad238ff Update 13.0.0-14.0.0.sql 2021-04-03 10:25:44 +02:00
ptibogxiv
8675484d90 Update llx_c_action_trigger.sql 2021-04-03 10:25:29 +02:00
NextGestion
6cac5f2212 Create Partnership Module 2021-04-03 09:24:07 +01:00
Laurent Destailleur
92da23945b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:51:14 +02:00
Laurent Destailleur
cbbaecd100 Merge branch 'pr_batch_mask' of https://github.com/altairisfr/dolibarr 
into altairisfr-pr_batch_mask

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:49:49 +02:00
Laurent Destailleur
25e32c4fcd Merge branch 'develop' into dev_EventOrganisation 2021-04-02 22:43:10 +02:00
Laurent Destailleur
d9a8673ca3 Merge pull request #17078 from dolibit-ut/patch-205 
Update llx_10_c_regions.sql
 2021-04-02 22:35:03 +02:00
UT from dolibit
473134cc46 Update llx_20_c_departements.sql 
Angola - up & fix   fk_region 'xx'
 2021-04-02 20:26:11 +02:00
UT from dolibit
9677d35aca Update llx_10_c_regions.sql 2021-04-02 20:18:14 +02:00
Laurent Destailleur
0a03ee5cd4 Comment 2021-04-02 15:44:06 +02:00
ptibogxiv
cacc785305 Update 13.0.0-14.0.0.sql 2021-04-02 13:48:51 +02:00
ptibogxiv
5329a1792e NEW add action trigger for member excluded 2021-04-02 13:48:27 +02:00
Florian HENRY
4cf8c4c685 add conf or booth contact tab and roles 2021-04-02 12:06:03 +02:00
Christophe Battarel
0adbffd864 fix typo 2021-04-02 08:24:10 +02:00
Laurent Destailleur
4e94e2f047 Merge pull request #17069 from dolibit-ut/patch-204 
Update llx_20_c_departements.sql
 2021-04-02 01:51:54 +02:00
Laurent Destailleur
8ff15d7567 Try to fix some id parent, at least for SKR03 2021-04-02 01:28:18 +02:00
Laurent Destailleur
83ed2ffefd Fix syntax errors 2021-04-02 01:12:45 +02:00
UT from dolibit
166ed32c32 Update llx_20_c_departements.sql 
Algeria
Brazil
 2021-04-01 12:52:06 +02:00
Laurent Destailleur
3d1c47db35 Fix bad table name for migration 2021-04-01 11:28:35 +02:00
Laurent Destailleur
6fc70fba8c Merge pull request #16981 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-31 22:29:39 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Frédéric FRANCE
6831d0e883 add dynamic 2021-03-31 18:49:19 +02:00
Frédéric FRANCE
1823fb34bb Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4 2021-03-31 18:41:49 +02:00