Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,883 Commits 35 Branches 179 Tags 1.7 GiB
9f045eb996
Commit Graph

49232 Commits

Author SHA1 Message Date
Maxime Kohlhaas
9f045eb996 Missing comments 2016-12-10 22:07:05 +01:00
Maxime Kohlhaas
1f48e0486f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-10 21:50:31 +01:00
Laurent Destailleur
2dda1d7c74 Merge pull request #6116 from simnandez/develop 
Fix: fails to load image to redim into photo resize
 2016-12-10 20:00:52 +01:00
Laurent Destailleur
4f86bb0e5b Merge pull request #6119 from defrance/patch-53 
Better display on internal/external module info
 2016-12-10 20:00:32 +01:00
Laurent Destailleur
653eb4d907 Fix project into dol_banner 2016-12-10 20:00:07 +01:00
Juanjo Menent
d310fb71a1 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-10 19:59:50 +01:00
Maxime Kohlhaas
6474591e25 Allow to enter price in currency 2016-12-10 19:54:16 +01:00
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
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
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
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
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
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
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
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
florian HENRY
654fbc5dc7 fix travis 2016-12-10 11:36:43 +01:00
Alexis Algoud
73f5254159 FIX #6031 search on login but fullname displayed 2016-12-10 11:35:34 +01:00
Laurent Destailleur
e83bb0f50c Merge pull request #6098 from atm-florian/develop 
FIX : Do not include separate extrafields into export
 2016-12-10 11:30:00 +01:00
Laurent Destailleur
3b193e2e22 Merge pull request #6101 from atm-florian/dev_accoutnacy 
fix default account selection (when cache is use)
 2016-12-10 11:29:20 +01:00