lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57,211 Commits 43 Branches 150 Tags 886 MiB
fd09a3d35e
Commit Graph

57211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BENKE Charlie
b74071dc73 Better display on internal/external module info 2016-12-10 19:35:58 +01:00
Laurent Destailleur
518049bed4 Fix pagination 2016-12-10 19:26:58 +01:00
Laurent Destailleur
3131ef7b86 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-10 19:21:22 +01:00
Laurent Destailleur
cdba7cfa1c Clean api rest 2016-12-10 19:04:56 +01:00
Laurent Destailleur
1eb67484dd Merge pull request #6117 from aspangaro/5.0-b2 
Fix Social contribution - Missing information in tab information
 2016-12-10 17:58:17 +01:00
Laurent Destailleur
7716d66ea9 Merge pull request #6118 from aspangaro/5.0-b3 
Fix Loan - Register a payment with a comma
 2016-12-10 17:56:56 +01:00
Maxime Kohlhaas
b1d5f2689a Fix colspan missing 2016-12-10 16:45:52 +01:00
Maxime Kohlhaas
eb8f89119f Dynamic select currency 2016-12-10 16:20:37 +01:00
aspangaro
a750007155 Fix Loan - Register a payment with a comma 2016-12-10 16:17:52 +01:00
aspangaro
a3b070d641 Responsive 2016-12-10 16:17:15 +01:00
Laurent Destailleur
ce41c84c95 Fix td class 2016-12-10 16:00:33 +01:00
Laurent Destailleur
185e9e88ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-10 15:59:52 +01:00
aspangaro
542499d94e Fix Social contribution - Missing information in tab information 2016-12-10 15:47:44 +01:00
aspangaro
bc189c0f6a Responsive 2016-12-10 15:13:24 +01:00
Juanjo Menent
198bef1bb5 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-10 14:50:40 +01:00
Juanjo Menent
99542de935 Fix: fails to load image to redim into photo resize 2016-12-10 14:47:18 +01:00
Laurent Destailleur
f49d332b73 Merge pull request #6113 from atm-maxime/3.8 
Fix : delete product was not possible if batch stock
 2016-12-10 13:16:50 +01:00
Laurent Destailleur
46d84f8f11 Merge pull request #6111 from simnandez/3.8 
Fix: Delete surplus migration file
 2016-12-10 13:16:16 +01:00
Laurent Destailleur
3a05bc4537 Merge pull request #6109 from atm-florian/develop 
fix : Bug when updating availability and demand reason on proposal because $user is not passed to trigger.
 2016-12-10 13:15:08 +01:00
Laurent Destailleur
75722992f5 Merge pull request #6110 from simnandez/develop 
Fix #6106 error message when cancel pic resize
 2016-12-10 13:14:06 +01:00
Laurent Destailleur
da5303b9d3 Merge pull request #6112 from jpfox/develop 
FIX Use current chart of accounts to get accountancy labels in journals
 2016-12-10 13:12:28 +01:00
Maxime Kohlhaas
97e21cb775 Fix : delete product was not possible if batch stock 2016-12-10 13:05:46 +01:00
Laurent Destailleur
50bc65ce77 Add css to help debug 2016-12-10 13:05:38 +01:00
Jean-Pierre Morfin
b13cf15b8c Use current chart of accounts to get accountancy labels in journals view and export 2016-12-10 12:59:10 +01:00
florian HENRY
e61770671a fix : create project from facture rec and back url wrong 2016-12-10 12:53:58 +01:00
Juanjo Menent
829ff2299e Fix: Delete surplus migration file 2016-12-10 12:46:26 +01:00
Juanjo Menent
d5e28fa3d2 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-10 12:28:09 +01:00
Juanjo Menent
370f76d097 Fix #6106 error message when cancel pic resize 2016-12-10 12:27:11 +01:00
florian HENRY
0e72e8492e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-12-10 12:22:07 +01:00
florian HENRY
9e8991f7fa FIX : Bug when updateing availability and demand reason because $user 
is not passed to trigger.
 2016-12-10 12:21:48 +01:00
Laurent Destailleur
08f27a5c28 Merge pull request #6076 from olsesacl/#6062 
FIX: #6062 Can't add images to the description when edit product
 2016-12-10 12:13:44 +01:00
Laurent Destailleur
338db92275 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-10 12:12:51 +01:00
Laurent Destailleur
d5c7151bc8 FIX #6102 2016-12-10 12:11:09 +01:00
florian HENRY
0f0db5a3fb fix: uniformize 2016-12-10 12:06:18 +01:00
Laurent Destailleur
45783e6bc5 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-10 12:04:56 +01:00
Laurent Destailleur
a45915e4a0 Better message after report on #5933 2016-12-10 12:04:13 +01:00
Juanjo Menent
82ed2ed20b Merge remote-tracking branch 'upstream/develop' into develop 2016-12-10 11:55:41 +01:00
Laurent Destailleur
facd0d9743 Merge pull request #6099 from atm-florian/dev_advtaremailng 
NEW : Finnish Advance target emailing feature
 2016-12-10 11:55:05 +01:00
Laurent Destailleur
5f432bd738 Merge pull request #6105 from jpfox/patch-1 
FIX Calling soc.php with an unknown socid display a message
 2016-12-10 11:54:19 +01:00
Laurent Destailleur
f6c42053a4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-12-10 11:52:11 +01:00
Laurent Destailleur
7ec4bc055a Sync transifex 2016-12-10 11:51:55 +01:00
florian HENRY
a422819277 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng 2016-12-10 11:49:52 +01:00
florian HENRY
2d2959ffba Set hidden option back 2016-12-10 11:49:35 +01:00
Jean-Pierre Morfin
4b4dc8fe0d FIX Calling soc.php with an unknown socid display a message 
Fix #4632
Calling soc.php with an unknown socid display a simple error message
 2016-12-10 11:49:16 +01:00
Laurent Destailleur
bd1d076753 Merge pull request #6096 from aspangaro/5.0-b2 
VAT payment card - Uniformize presentation
 2016-12-10 11:44:38 +01:00
Laurent Destailleur
bed23483d6 Merge pull request #6094 from benlo06/fix_list_fourn 
Fix missing column in supplier list
 2016-12-10 11:43:09 +01:00
Laurent Destailleur
4bb778c54f Merge pull request #6095 from aspangaro/5.0-b1 
Fix presentation on Loan / Expense report / VAT
 2016-12-10 11:42:08 +01:00
Laurent Destailleur
668937d7c9 Merge pull request #6097 from hregis/4.0_bug 
Fix: contract use "total_vat" instead "total_tva"
 2016-12-10 11:41:09 +01:00
Laurent Destailleur
9dc02fd154 Merge pull request #6104 from atm-alexis/FIX_list_commande_author_search 
FIX #6031 search on login but fullname displayed
 2016-12-10 11:39:03 +01:00
florian HENRY
3b25bf2ee6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng 2016-12-10 11:37:07 +01:00