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

56842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
82ed2ed20b Merge remote-tracking branch 'upstream/develop' into develop 2016-12-10 11:55:41 +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
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
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
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
Laurent Destailleur
bc8b2ae331 Update doc 2016-12-08 13:13:46 +01:00
Laurent Destailleur
cdf0707c5a Merge pull request #6090 from aspangaro/5.0-b1 
Fix: Field comments not registered in new member public form & presentation
 2016-12-08 12:47:31 +01:00
Laurent Destailleur
521eb3a520 Prepare 5.0 2016-12-08 12:44:58 +01:00
aspangaro
cd39b1c6f0 Fix: Field comments not registered in new member public form & presentation 2016-12-08 00:12:54 +01:00
Laurent Destailleur
2938e01fdd Fix a delete must be done after a fetch 2016-12-07 19:16:33 +01:00
Laurent Destailleur
49f5ec6b52 Fix bugs reported by scrutinizer 2016-12-07 19:12:25 +01:00
Laurent Destailleur
1838670e31 Fix several security holes on api when used by external users 2016-12-07 19:02:39 +01:00
Laurent Destailleur
d23604701c Fix responsive 2016-12-07 15:00:20 +01:00
Laurent Destailleur
083aef9b90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-07 14:27:07 +01:00
Laurent Destailleur
1583d0e49f Fix linkof mass action for pdf merge 2016-12-07 14:14:03 +01:00
Laurent Destailleur
3abeee2d7d Code comment 2016-12-07 13:38:53 +01:00
Laurent Destailleur
d0f66e4d80 Merge pull request #6070 from gnovaro/patch-1 
New Improve code style php5/7
 2016-12-07 13:20:05 +01:00
Laurent Destailleur
9efcda6714 Merge pull request #6086 from fappels/develop-work-on-warehouse-status 
New continue work on warehouse status #5115
 2016-12-07 13:06:07 +01:00
Laurent Destailleur
1f75c2b198 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-07 12:42:00 +01:00
Laurent Destailleur
455a9ed4da FIX security in import of files 2016-12-07 12:41:48 +01:00
Laurent Destailleur
f9ef6f52a6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
 2016-12-07 12:23:43 +01:00
Laurent Destailleur
6b5ce5c699 Merge pull request #6084 from milamberspace/Fix_ICE_Maroc 
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files …
 2016-12-07 12:00:03 +01:00
Laurent Destailleur
b6463c52b6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-07 11:54:57 +01:00
Laurent Destailleur
c75a00e683 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-07 11:54:41 +01:00
Laurent Destailleur
ad467989bf Merge pull request #6065 from atm-florian/3.9 
FIX : delete contract extrafields on contract deletion
 2016-12-07 11:54:04 +01:00
Laurent Destailleur
93764b7310 Merge pull request #6079 from jfefe/patch-11 
Fix : bad function name in skeletons list
 2016-12-07 11:52:21 +01:00