Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
99,661 Commits 36 Branches 190 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

6265 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Destailleur
6ba725eb5e Fix sql error 2021-03-30 21:04:12 +02:00
Laurent Destailleur
48f97d77df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-30 19:35:25 +02:00
Laurent Destailleur
cdd3e385e7 Merge branch 'new-propal-signature-date-and-user' of 
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-03-30 19:34:25 +02:00
Laurent Destailleur
dc23d8316c Merge pull request #17024 from dolibit-ut/patch-187 
Update llx_20_c_departements.sql
 2021-03-30 19:22:10 +02:00
Laurent Destailleur
fd410adcf3 Update llx_20_c_departements.sql 2021-03-30 19:22:02 +02:00
Laurent Destailleur
0a28db619b Merge pull request #17022 from dolibit-ut/patch-186 
Update llx_10_c_regions.sql
 2021-03-30 19:17:20 +02:00
Laurent Destailleur
ab58ba80c9 Update llx_10_c_regions.sql 2021-03-30 19:17:12 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
Laurent Destailleur
c80a8517d4 Fix position of line for ticket group 2021-03-30 17:39:48 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
UT from dolibit
a9bc37c63e Update llx_20_c_departements.sql 2021-03-30 16:19:07 +02:00
UT from dolibit
d098ca7bec Update llx_10_c_regions.sql 
LICENSE

Australia
Barbados
Brazil
Canada
 2021-03-30 16:01:35 +02:00
Laurent Destailleur
08c7458dd9 FIX #yogosha5746 2021-03-30 11:36:50 +02:00
lvessiller
85fff685db Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:04:19 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
2d83686ddd Keep copyright in same section than licence 2021-03-29 23:53:27 +02:00