Commit Graph

94010 Commits

Author SHA1 Message Date
Florian HENRY
df7f18d4d2 add hook to add directory into ECM auto files 2021-02-05 13:33:48 +01:00
Laurent Destailleur
5cd80015db
Merge pull request #16044 from frederic34/supplier_proposal_extrafields_keys
add missing index in extrafields tables of supplier proposal
2021-01-22 02:10:29 +01:00
Laurent Destailleur
d368b3c7d6
Merge pull request #16046 from atm-john/new/manifest_use_squared_img
NEW : manifest use squared image or custom
2021-01-22 02:05:35 +01:00
stickler-ci
bb09a39ce6 Fixing style errors. 2021-01-21 20:52:21 +00:00
ATM john
04dc3ae8cd NEW : manifest use squared image or custom 2021-01-21 21:46:00 +01:00
Frédéric FRANCE
c77c5628ca
add another missing undex 2021-01-21 21:35:30 +01:00
Frédéric FRANCE
7888b3d33e
add missing index in extrafields tables of supplier proposal 2021-01-21 21:19:03 +01:00
Laurent Destailleur
ddc163e79e
Merge pull request #16025 from FHenry/dev_fix_createcontactmailmandatory
fix bulk email mandatory only if contact creation is ask
2021-01-21 14:07:13 +01:00
Laurent Destailleur
8eee4a79e7
Merge pull request #16032 from frederic34/patch-1
fix colspan too small
2021-01-21 13:34:41 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
2021-01-21 13:33:47 +01:00
Laurent Destailleur
bacf625291
Merge pull request #16026 from frederic34/getfather
add status and status_buy
2021-01-21 13:24:53 +01:00
Laurent Destailleur
f160246272
Merge pull request #16031 from frederic34/commtpl
add more infos in link
2021-01-21 13:24:17 +01:00
Laurent Destailleur
b0ea2ac187
Merge pull request #16033 from FHenry/12_fix_position_coutry_resource
move extrafield to the end as other card
2021-01-21 13:22:04 +01:00
Laurent Destailleur
5aebf18dce
Merge pull request #16037 from bb2a/bug_migration_drop_foreignkey
Update 13.0.0-14.0.0.sql
2021-01-21 13:14:33 +01:00
Laurent Destailleur
cfa593def1 Fix must be foreign key name, not field name. 2021-01-21 13:13:59 +01:00
Laurent Destailleur
437ca1d357
Merge pull request #16038 from Hystepik/develop#3
Fix #16036 Mysql syntax error 13.0.0-14.0.0
2021-01-21 13:12:24 +01:00
lmarcouiller
3ab773c510 Fix #16036 Mysql syntax error 2021-01-21 10:51:14 +01:00
Anthony Berton
7be25260f3 Update 13.0.0-14.0.0.sql 2021-01-21 10:35:06 +01:00
Florian HENRY
2a19528267 move extrafield to the end as other acard 2021-01-21 08:52:10 +01:00
Frédéric FRANCE
01e41a8ddd
fix colspan too small 2021-01-20 22:40:40 +01:00
Frédéric FRANCE
55d3eec200
add more infos in link 2021-01-20 22:04:24 +01:00
Frédéric FRANCE
1293eb66db
add more infos in link 2021-01-20 21:25:51 +01:00
Frédéric FRANCE
118c9ac990
add more infos in link 2021-01-20 21:02:01 +01:00
Frédéric FRANCE
96dffb619a
add more infos in link 2021-01-20 18:48:56 +01:00
Frédéric FRANCE
9e5f0a8cb9
add more infos in link 2021-01-20 18:45:44 +01:00
Frédéric FRANCE
84985c5065
add status and status_buy 2021-01-19 18:01:30 +01:00
Florian HENRY
0aa2de230e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createcontactmailmandatory 2021-01-19 17:52:40 +01:00
Florian HENRY
c28ce8d3b4 fix bulk email mandatory only if contact creation is needed 2021-01-19 17:52:27 +01:00
Laurent Destailleur
9e5dc89cea
Merge pull request #16021 from dolibit-ut/patch-69
Update ChangeLog
2021-01-19 16:23:26 +01:00
Laurent Destailleur
3926d102b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 16:22:38 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Laurent Destailleur
803ae91136 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-19 16:20:19 +01:00
Laurent Destailleur
755de9fff2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-19 16:19:46 +01:00
Laurent Destailleur
a0fe2a8abc
Merge pull request #16022 from frederic34/patch-1
Update .gitignore
2021-01-19 16:19:26 +01:00
Laurent Destailleur
fd65a2adc1 FIX #15955 2021-01-19 16:04:21 +01:00
Laurent Destailleur
560d401cff Code comment 2021-01-19 15:54:24 +01:00
Laurent Destailleur
a81b3a0d61 FIX #15946 2021-01-19 15:23:36 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
Frédéric FRANCE
b2d790b46a
Update .gitignore 2021-01-19 14:27:31 +01:00
Laurent Destailleur
2d8ca513d6 Fix param 'all' 2021-01-19 12:55:24 +01:00
UT from dolibit
7629961b50
Update ChangeLog
moved to TAKEPOS:
NEW: delayed payment in TakePOS                                           ->  NEW: TakePOS add delayed payment
NEW: display date range if exist in TakePOS                              ->  NEW: TakePOS display date range if exist
NEW: display resiliate status in TakePOS for member                ->  NEW: TakePOS display resiliate status for members
2021-01-19 12:44:13 +01:00
Laurent Destailleur
14ef211ed5
Merge pull request #15997 from bb2a/warehouse_on_thirparty
NEW Add Warehouse affect on Thirparty
2021-01-19 12:38:33 +01:00
Laurent Destailleur
8e357bf695
Update 13.0.0-14.0.0.sql 2021-01-19 12:37:48 +01:00
Laurent Destailleur
7472b102e4 Fix name of constraints 2021-01-19 12:32:37 +01:00
Laurent Destailleur
3033b1d5da
Update llx_societe.key.sql 2021-01-19 12:30:50 +01:00
Laurent Destailleur
67d9b38e45
No foreign key when field stored for a "defaut value" 2021-01-19 12:30:16 +01:00
Laurent Destailleur
7cb8d5af55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 12:25:28 +01:00
Laurent Destailleur
f54efca075 Clean code 2021-01-19 12:25:05 +01:00
Laurent Destailleur
d82765c6da
Update card.php 2021-01-19 12:15:56 +01:00
Laurent Destailleur
fe537fb2fc
Fix MVC 2021-01-19 12:14:54 +01:00