lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,762 Commits 43 Branches 150 Tags 886 MiB
8214e7bb42
Commit Graph

64762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
286d62edb8
Merge pull request #8221 from ATM-Marc/FIX_usercard_columns 
FIX: solve column mismatch in user card with multicompany transverse mode + code cleanup
 2018-02-25 12:35:05 +01:00
Rui Strecht
7b448a2d18 Fixed issue with elementarray null if num_rows = 0 2018-02-25 12:29:15 +01:00
Laurent Destailleur
c698558d9e
Merge pull request #8212 from simnandez/6.0 
Fix: Not showing link to ad event if module is disabled
 2018-02-25 12:28:06 +01:00
Laurent Destailleur
b20ae45265
Merge pull request #8210 from atm-john/fix_sql_entity 
Fix sql entity for sub query
 2018-02-25 12:27:35 +01:00
Laurent Destailleur
6a78ce65e9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/imports/import.php
 2018-02-25 12:21:10 +01:00
Laurent Destailleur
2d252e85e6 FIX Import process must stop after ending line nb to import 2018-02-25 12:15:36 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214 Fix: missing hook parameters 2018-02-24 15:01:29 +01:00
Regis Houssin
3859b5a926 Fix: Parameter must be an array or an object that implements Countable 2018-02-24 14:20:53 +01:00
Laurent Destailleur
a5b1f114c2 FIX Generic substitution of constant disabled for sensitive constant 2018-02-24 14:03:32 +01:00
Laurent Destailleur
619e0d3792 FIX Bad var for substitution of free text 2018-02-24 14:03:27 +01:00
Regis Houssin
5ecbe2ae81 Fix: Use of undefined constant _ROWS_2 2018-02-24 13:49:30 +01:00
Laurent Destailleur
03d9bf1376 Restore deprecated var 2018-02-24 12:35:36 +01:00
Laurent Destailleur
cbfe241c1b FIX Can use odx templates that does not include lines tags 2018-02-24 12:34:15 +01:00
Laurent Destailleur
e68612fa09 Fix initdemo must not copy index.html files 2018-02-24 12:06:26 +01:00
Laurent Destailleur
435e4823a5 Fix some warning during install 2018-02-24 11:58:09 +01:00
Regis Houssin
4c06384197 Fix: differentiate sharing of "member" and "member_type" 2018-02-24 11:13:14 +01:00
Laurent Destailleur
812911bd44 Fix type of expense report output in PDF 2018-02-23 15:33:42 +01:00
Laurent Destailleur
953001c7ab Fix bad naming of column 2018-02-23 15:16:49 +01:00
florian HENRY
b4b185abe0 fix bad link invoice URL into acoutantcy customer affectation 2018-02-23 14:42:52 +01:00
Marc de Lima Lucio
36cc1c6ca9 FIX: solve column mismatch in user card's usergroup list + code cleanup 2018-02-23 11:59:22 +01:00
Laurent Destailleur
f7ecac8734 Fix look and feel v7 2018-02-23 11:40:56 +01:00
Laurent Destailleur
194f5a2cef Fix substitution key 2018-02-23 11:03:48 +01:00
Laurent Destailleur
3f9a9f20ce Fix missing substitution key 2018-02-22 17:06:18 +01:00
Laurent Destailleur
bc0993d6cd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-22 12:17:25 +01:00
Laurent Destailleur
479c4b4d77 Fix look and feel v7 2018-02-22 12:15:11 +01:00
Laurent Destailleur
51cfb9795e Fix bad picto 2018-02-22 11:26:41 +01:00
Juanjo Menent
1d6baf5f2b Fix: Not showing link to ad event if module is disabled 2018-02-22 10:16:53 +01:00
Laurent Destailleur
9114a28e88 Fix: missing the reposition 2018-02-21 22:43:25 +01:00
John
b276a8186e Fix sql entity for sub query 2018-02-21 10:03:04 +01:00
Laurent Destailleur
34135e0a13 Fix extrafield date or datetime with bad timezone 2018-02-20 19:20:47 +01:00
Laurent Destailleur
48d250b201 Help to understand 2018-02-20 15:55:58 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill 
fix the bill replacement with discounts #8028
 2018-02-20 15:19:19 +01:00
Laurent Destailleur
01c2971f4f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 15:08:17 +01:00
Laurent Destailleur
9690e68bfb
Merge pull request #8206 from fmarcet/5.0 
Fix: Barcode type on massive init
 2018-02-20 15:07:53 +01:00
Laurent Destailleur
f207e91643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/define_holiday.php
	htdocs/main.inc.php
	htdocs/societe/class/societe.class.php
 2018-02-20 15:06:41 +01:00
Laurent Destailleur
b8736f5103 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:59:40 +01:00
Laurent Destailleur
a698ba0b56
Merge pull request #8205 from steschuser/5.0 
FIX: #8139 User search does not work if MAIN_USE_OLD_SEARCH_FORM, missing list.php
 2018-02-20 14:59:20 +01:00
Laurent Destailleur
85e5ac678f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:56:17 +01:00
Laurent Destailleur
6c8e7494f0
Merge pull request #8200 from atm-maxime/fix_contact_tooltiip 
Fix contact tooltip
 2018-02-20 14:56:06 +01:00
Laurent Destailleur
276f2dce77 FIX #8200 2018-02-20 14:55:23 +01:00
Laurent Destailleur
67ee443b34 Fix can set holiday remaining to 0 2018-02-20 14:53:19 +01:00
Laurent Destailleur
b361877ea8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-20 12:48:28 +01:00
Laurent Destailleur
4056b87a74 Fix syntax error 2018-02-20 12:36:03 +01:00
Laurent Destailleur
7321829732 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 12:34:15 +01:00
Laurent Destailleur
ea071b7680 Fix can't delete holiday refused 2018-02-20 12:31:26 +01:00
Laurent Destailleur
16fca2ee35 Fix bad link 2018-02-20 10:05:11 +01:00
Laurent Destailleur
87a3019e73 Fix upgrade missing steps 2018-02-20 06:03:22 +01:00
Laurent Destailleur
aa1ede6f74 FIX Search criteria on vat 2018-02-20 06:03:08 +01:00
Laurent Destailleur
cb644665bd Fix output dir of grab 2018-02-20 06:02:53 +01:00