Commit Graph

57163 Commits

Author SHA1 Message Date
Laurent Destailleur
b777ec79f2 Fix contextpage implementation into skeleton 2016-12-23 10:38:27 +01:00
Laurent Destailleur
da1d4d80f2 Fix return code REST similar for all api with POST 2016-12-23 02:09:26 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Laurent Destailleur
5535a126d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-23 01:25:51 +01:00
Laurent Destailleur
f9d29bbe25 Complete sample of setup files 2016-12-23 01:25:40 +01:00
Laurent Destailleur
84fa65ac19 Merge pull request #6208 from aspangaro/5.0-15
Remove field Skype. Already present in dol_banner_tab.
2016-12-23 00:53:05 +01:00
Laurent Destailleur
9948b6d4d9 Merge pull request #6202 from GPCsolutions/supplierpaymentdateexport
NEW: Export max payment date with supplier invoices
2016-12-23 00:50:30 +01:00
Laurent Destailleur
66b8cfe9fd Merge pull request #6200 from defrance/patch-63
$soc not needed (thirpartie used instead)
2016-12-23 00:46:22 +01:00
Laurent Destailleur
bf08407222 Merge pull request #6204 from gnovaro/patch-1
var to public
2016-12-23 00:45:58 +01:00
Laurent Destailleur
6d14710e18 Merge pull request #6199 from aspangaro/5.0-p14
Loan | Donation | Social contribution : Complete work on dol_banner
2016-12-23 00:45:08 +01:00
Laurent Destailleur
0aaedcc68c Merge pull request #6197 from aspangaro/5.0-b13
Fix: Accountancy Expense report index
2016-12-23 00:44:43 +01:00
Laurent Destailleur
594ecf400b Merge pull request #6196 from aspangaro/5.0-b12
Fix: Travis
2016-12-23 00:44:16 +01:00
Laurent Destailleur
4843e3f254 Merge pull request #6193 from bafbes/abb-22
new: Professional identifiers for Algeria
2016-12-23 00:42:42 +01:00
Laurent Destailleur
07e81830d1 Merge pull request #6195 from aspangaro/5.0-b11
Fix: Traduction on index accountancy page & improvements
2016-12-23 00:42:11 +01:00
Laurent Destailleur
2bfbf0f6a7 Fix css 2016-12-23 00:37:32 +01:00
Laurent Destailleur
1e1028605d FIX If mysql server is distant, the creation of user must use % as host
with mysql.
2016-12-23 00:23:57 +01:00
Laurent Destailleur
dcb14db10d Add .pml files into fixdosfiles 2016-12-22 18:03:34 +01:00
Laurent Destailleur
3c10a32193 Merge 2016-12-22 17:59:41 +01:00
Laurent Destailleur
293560f9c1 Fix missing ref is object is supplier object 2016-12-22 17:41:58 +01:00
Laurent Destailleur
22b4a150a4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-22 17:31:22 +01:00
Laurent Destailleur
39bd9a69ec Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-22 17:30:50 +01:00
Laurent Destailleur
b4ed0a1e12 Fix nb of lat approvals wrong 2016-12-22 17:30:39 +01:00
Laurent Destailleur
bdead24e2e Fix bad var get 2016-12-22 17:27:58 +01:00
Laurent Destailleur
081d3f0814 Quick hack by adding hidden constant to solve a locking feature (how to
add project if likned to another third on project view)
2016-12-22 16:52:03 +01:00
Laurent Destailleur
b2776a62d8 Fix bad link 2016-12-22 16:23:38 +01:00
Laurent Destailleur
1307b93d55 Normalize code 2016-12-22 16:09:12 +01:00
Laurent Destailleur
4875509b56 Fix sort criterias 2016-12-22 15:57:19 +01:00
Laurent Destailleur
d66bc10d05 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/list.php
2016-12-22 15:54:01 +01:00
Laurent Destailleur
574f84bb84 Fix warning for approval delay. 2016-12-22 15:49:06 +01:00
Laurent Destailleur
77c320a092 Fix warning for expense report late 2016-12-22 15:33:43 +01:00
aspangaro
6caa3408ed Remove field Skype. Already present in dol_banner_tab. 2016-12-22 06:23:43 +01:00
aspangaro
c187f95269 Social contribution : Complete work on dol_banner 2016-12-20 21:59:05 +01:00
aspangaro
eb2d85ab78 Donation : Complete work on dol_banner & Fix project selector 2016-12-20 21:39:42 +01:00
Gustavo Novaro
3542364da8 var to public
Improve code style to current php practices
2016-12-20 17:11:50 -03:00
Laurent Destailleur
d08857d2c6 Fix photo resize 2016-12-20 19:35:47 +01:00
Raphaël Doursenaud
590fcf8399
NEW: Export max payment date with supplier invoices 2016-12-20 18:32:57 +01:00
BENKE Charlie
499eedffa1 $soc not needed (thirpartie 2016-12-20 15:17:17 +01:00
Laurent Destailleur
0ef963604f Fix option moreinheader not correctly supported with smtps 2016-12-20 12:38:24 +01:00
Laurent Destailleur
3c79f3acb5 Minor fixes or code comment 2016-12-20 12:06:26 +01:00
Laurent Destailleur
4d624fd875 Debug feature to choose email "from" 2016-12-20 11:23:44 +01:00
aspangaro
e9765c5190 Remove colspan 2016-12-20 07:33:03 +01:00
aspangaro
098dc08169 Loan : Complete work on dol_banner 2016-12-20 07:29:49 +01:00
Laurent Destailleur
be19a999f5 Fix regression losing warning on not defined emails 2016-12-19 18:11:53 +01:00
Laurent Destailleur
8fb9a55d8a Complete work on dol_banner 2016-12-19 16:35:40 +01:00
Laurent Destailleur
1fdbcf4c0f Fix missing page to match new reorg of agenda events (done for
thirdparty but not complete for contact)
2016-12-19 16:22:41 +01:00
aspangaro
0fae7ecd5a Fix: Accountancy Expense report index 2016-12-19 07:43:33 +01:00
aspangaro
9901aaa9fe Try to correct travis public underscore problem 2016-12-19 06:34:17 +01:00
aspangaro
23aea440d6 Fix: Travis 2016-12-19 06:04:54 +01:00
aspangaro
e1773249c3 Fix: Traduction on index accountancy page & improvements 2016-12-19 05:56:47 +01:00
Laurent Destailleur
0eded9a8b7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-19 02:36:10 +01:00