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

56863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
cdba7cfa1c Clean api rest 2016-12-10 19:04:56 +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
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
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
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
florian HENRY
b17480928e fix default account selection (when cache is use) 2016-12-10 10:40:38 +01:00
Laurent Destailleur
aac44d5797 Add cambodgian files 2016-12-10 10:25:02 +01:00
florian HENRY
9da324031c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-12-10 09:57:18 +01:00
Juanjo Menent
0c1e754b91 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-10 09:16:20 +01:00
Laurent Destailleur
5353aa6efe Better error management when creating bookkeepin entries 2016-12-10 02:38:07 +01:00
florian HENRY
a0e8b509db Finish Advance target emailing feature (back from hashes since 3.7) 2016-12-09 19:06:59 +01:00
florian HENRY
ec5a094d27 FIX : Do not include separate extrafields into export cause "separate" 
extrafields aren't sql column
 2016-12-09 17:17:58 +01:00
Laurent Destailleur
10c00d37b5 Complete use of dol_banner 2016-12-09 15:59:31 +01:00
Laurent Destailleur
fb45c72cc3 Complete use of dol_banner 2016-12-09 15:03:57 +01:00
Laurent Destailleur
d5e417010f Complete work on dol_banner 2016-12-09 11:16:04 +01:00
aspangaro
b1c007aa75 VAT payment card - Uniformize presentation 2016-12-09 06:59:24 +01:00
Benoit
9f51691ae4 Fix bug on fournisseur list 2016-12-09 00:15:59 +01:00
aspangaro
b31d5d7f75 VAT - Correct presentation on card 2016-12-08 22:50:03 +01:00
aspangaro
302109b3fe Loan - Move tab Notes after Files tab 2016-12-08 22:32:10 +01:00
aspangaro
cd4286b302 Loan - Remove field note_private and note_public into view/edit mode. Already present in tab Notes 2016-12-08 22:27:48 +01:00
aspangaro
eef245d23b Expense report - Hidden button to generate files in create mode 2016-12-08 22:17:03 +01:00
aspangaro
0d5c035034 Expense report - Remove filed note_private and note_public in card. Already in tab Notes 2016-12-08 22:12:16 +01:00
Laurent Destailleur
612c7fde5e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-12-08 15:53:36 +01:00