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

208 Commits

Author SHA1 Message Date
Gauthier PC portable 024
a596424328 FIX : Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid 2021-04-14 16:01:48 +02:00
Laurent Destailleur
192fcb89d2 Merge pull request #17097 from NextGestion/dolibarr_partnership 
Create Partnership Module
 2021-04-13 16:33:54 +02:00
Laurent Destailleur
4bbe02c209 Merge pull request #17223 from atm-gauthier/fix_migration_script 
FIX : UPDATE query must not use alias for postgres compatibility
 2021-04-13 15:37:42 +02:00
Laurent Destailleur
1bae707246 Prepare table for future enhancement 2021-04-13 11:38:37 +02:00
Gauthier PC portable 024
aff07ac13c FIX : UPDATE query must not use alias for postgres compatibility 2021-04-12 14:43:28 +02:00
NextGestion
2035b956a6 Fix Sql & translate files 2021-04-10 10:57:23 +01:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
Dorian Vabre
a590f945e9 thirdparty creation OK, wip on conforboothattendee creation 2021-04-09 16:12:25 +02:00
NextGestion
d6e4cb7d0b Merge branch 'develop' into dolibarr_partnership 2021-04-09 12:01:44 +01:00
Christophe Battarel
4f413ca983 add fk_project to warehouse table 2021-04-08 16:46:52 +02:00
NextGestion
ace958240d Merge branch 'develop' into dolibarr_partnership 2021-04-07 12:30:37 +01: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
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
NextGestion
6da2c47360 Add template email for cancel partnership 2021-04-05 18:13:51 +01:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +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
Florian HENRY
4cf8c4c685 add conf or booth contact tab and roles 2021-04-02 12:06:03 +02:00
Laurent Destailleur
3d1c47db35 Fix bad table name for migration 2021-04-01 11:28:35 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +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
c80a8517d4 Fix position of line for ticket group 2021-03-30 17:39:48 +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
Laurent Destailleur
a4987c6e4f Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Florian HENRY
11dcf656c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 20:30:31 +02:00
Florian HENRY
1f08e37a03 more feature 2021-03-29 20:28:29 +02:00
Christophe Battarel
bbc263f4b3 llx_product batch_mask definition 2021-03-29 18:39:22 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
Florian HENRY
a254bbcc02 fix translation 2021-03-26 19:05:55 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
lvessiller
8a2e49d6e7 NEW date and user signature on proposal (Issue 16062) 2021-03-26 17:44:41 +01:00
Florian HENRY
e898fbb834 almost done 2021-03-24 21:21:53 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Laurent Destailleur
37c04b794f Add property "ticket group is public" in dicitonary of ticket groups. 2021-03-24 12:13:23 +01:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
e334e83a64 Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Laurent Destailleur
ee84bef3b2 Merge pull request #16828 from frederic34/membersboxfix 
fix new boxes add
 2021-03-20 11:52:19 +01:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
Frédéric FRANCE
7183bfeb94 fix new boxes add 2021-03-19 09:15:35 +01:00
Laurent Destailleur
27c7950417 Fix migration of boxes 2021-03-18 23:39:19 +01:00
Laurent Destailleur
8d19c57731 Add fields to know authentication method used 2021-03-18 12:54:49 +01:00
Laurent Destailleur
1685e1be79 Fix to keep tms not updated 2021-03-17 12:39:29 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Laurent Destailleur
2129adf129 Add more fields to llx_oauth_token 2021-03-15 13:25:08 +01:00
Laurent Destailleur
8192349320 Fix migration 2021-03-10 16:49:42 +01:00