Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,144 Commits 36 Branches 190 Tags
8c08786182701b19ffc901bdbb1f7cf7156d98d0
Commit Graph

2344 Commits

Author SHA1 Message Date
ksar
429992ee7f FIX #16590 2021-03-09 10:46:11 +01:00
Laurent Destailleur
c483ad5dda Merge branch 'develop' into develop 2021-03-06 11:25:52 +01:00
Laurent Destailleur
7a193b4c87 Add index on tag. Reduce tag length 2021-03-05 14:53:13 +01:00
Laurent Destailleur
b92bfb007f Merge pull request #16520 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-04 17:06:57 +01:00
Florian HENRY
ecd1915c0a fix sql 2021-03-04 07:45:27 +01:00
Florian HENRY
879e8fe5f6 fix sql 2021-03-04 07:44:00 +01:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Florian HENRY
0f51072222 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-03-02 11:01:02 +01:00
Florian HENRY
17c8a32780 fix civility createion PK 2021-03-02 11:00:16 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
Florian HENRY
036d1d5802 change comlumn name 2021-03-01 15:36:22 +01:00
Florian HENRY
e101ff0d6d change comlumn name 2021-03-01 15:34:02 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
ca7958f273 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 07:32:23 +01:00
Florian HENRY
5221b59539 set correct field name as conference or booth are in actioncomm table 2021-02-27 15:34:28 +01:00
Florian HENRY
8bb0ff065a add missing column on actioncomm 2021-02-27 14:19:02 +01:00
Florian HENRY
5e0ca7417e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-02-27 13:16:37 +01:00
Florian HENRY
f13ef50768 set good agenda type event 2021-02-27 13:13:42 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
 2021-02-26 19:23:23 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Francis Appels
e12db6d1f1 Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp 2021-02-24 15:20:45 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +01:00
Florian HENRY
c9a51d971d rename column 2021-02-22 21:00:54 +01:00
Alexandre SPANGARO
7f4040e464 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:59:13 +01:00
Alexandre SPANGARO
22c936ba19 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:28:36 +01:00
Laurent Destailleur
f99232e66e Merge branch 'develop' into 14a21 2021-02-22 11:18:07 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Alexandre SPANGARO
ae4fc565e1 Widget & commonobject 2021-02-22 05:38:31 +01:00
Alexandre SPANGARO
ca4023fe23 Migration 2021-02-22 05:31:01 +01:00
Alexandre SPANGARO
2cd181b86d Code enhanced - Standardize field name #14697 2021-02-21 22:07:58 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
e3419df36e Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Florian HENRY
be34fb4541 tab event ok 2021-02-21 12:32:16 +01:00
Laurent Destailleur
4b632fb24f Merge branch 'develop' into 14a19 2021-02-20 17:08:23 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Alexandre SPANGARO
1017d480f9 Code enhanced - Standardize field name #14697 2021-02-20 07:08:37 +01:00
Alexandre SPANGARO
042038d185 Code enhanced - Standardize field name #14697 2021-02-18 22:42:55 +01:00
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Laurent Destailleur
0d841ecb1e Reduce field size 2021-02-16 19:36:14 +01:00
Gauthier PC portable 024
14f0b225bb Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 11:27:21 +01:00
Gauthier PC portable 024
9b18b15d8a FIX : several fixes 2021-02-09 11:25:30 +01:00
Francis Appels
d29fa04930 Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp 2021-02-09 10:51:34 +01:00
Gauthier PC portable 024
cd3ac694bb FIX : tables 2021-02-09 10:38:35 +01:00
Gauthier PC portable 024
d106fe7e90 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 09:50:46 +01:00
Laurent Destailleur
c0aa7e7db5 Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects 
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
 2021-02-08 17:19:40 +01:00
Laurent Destailleur
8041ef641a Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00