Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-27 20:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,005 Commits 36 Branches 191 Tags
c77c5628caa9cd7dfda441981663c77b97086603
Commit Graph

82772 Commits

Author SHA1 Message Date
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
cfa593def1 Fix must be foreign key name, not field name. 2021-01-21 13:13:59 +01:00
lmarcouiller
3ab773c510 Fix #16036 Mysql syntax error 2021-01-21 10:51:14 +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
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
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
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
stickler-ci
0cdd9f8640 Fixing style errors. 2021-01-19 10:43:03 +00:00
zuiko
21fac1ff7a Update mod_barcode_product_standard.php 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
#15918 
ok with @eldy
Avoid  sql call if no joker at the end of mask
Treat EAN13 in a more evolutive code form to prepare needs for other barcodes with key
 2021-01-19 11:40:53 +01:00
Laurent Destailleur
01996261dc Merge pull request #15985 from frederic34/codesyntax 
code syntax
 2021-01-19 11:29:18 +01:00
Laurent Destailleur
03d8c6bfd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
 2021-01-19 10:59:42 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
Laurent Destailleur
0c4d9c2e3a Merge pull request #16004 from Hystepik/develop#2 
Fix #15970 user.class.php
 2021-01-19 10:54:24 +01:00
Laurent Destailleur
8cd8f21fde Update user.class.php 2021-01-19 10:53:47 +01:00
Laurent Destailleur
7ad7ad9bb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 10:43:31 +01:00
Laurent Destailleur
2c6d11e040 When creating invoice by mass action, message has link to invoice 2021-01-19 10:42:43 +01:00
lmarcouiller
73eee33f8a redo of pull request with sql updated 2021-01-19 09:24:15 +01:00
lmarcouiller
e9ac1e3443 Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2 2021-01-19 09:16:23 +01:00
lmarcouiller
00fb045e40 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-01-19 09:16:14 +01:00
Frédéric FRANCE
36eeef81bf code syntax 2021-01-19 00:41:39 +01:00
Laurent Destailleur
6d251e6a43 Merge pull request #15963 from FHenry/13.0 
fix thirdparty list filter type_ent can be empty
 2021-01-18 19:21:58 +01:00