Commit Graph

74255 Commits

Author SHA1 Message Date
Rafael Ingenleuf
138cd833ff Pull mwelters
Merge branch 'patch-1' of https://github.com/mwelters/dolibarr into patch-1
2019-03-11 12:36:34 +01:00
Rafael Ingenleuf
c183a2c3a5 Merge https://github.com/mwelters/dolibarr into patch-1 2019-03-11 12:33:04 +01:00
markus
d7ca08afb0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-10 15:26:35 +01:00
markus
47fce826fe changes 2019-03-10 14:15:06 +01:00
markus
1737229eab update hints 2019-03-10 13:59:32 +01:00
markus
47f15897aa remove double line 2019-03-10 13:49:01 +01:00
markus
6a8d76ea39 honor MAIN_INVERT_SENDER_RECIPIENT 2019-03-10 13:44:50 +01:00
markus
6f05d6ea36 changes 2019-03-10 13:41:18 +01:00
markus
dcaed95bfe changes 2019-03-10 13:31:51 +01:00
markus
6ef6248d58 use fk_user_author 2019-03-10 13:27:22 +01:00
markus
b4c8977a44 next step 2019-03-10 13:22:21 +01:00
markus
b302f569a9 make public 2019-03-10 13:14:17 +01:00
markus
5b0ed63f6d use global $user 2019-03-10 13:11:43 +01:00
Laurent Destailleur
d659543ac0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 19:00:57 +01:00
Laurent Destailleur
fa4467fb5f FIX Tooltip on click was ko on smartphone 2019-03-09 18:37:07 +01:00
markus
1ac54853d9 improve 2019-03-09 18:34:57 +01:00
markus
a789cfe576 fix typo 2019-03-09 18:32:44 +01:00
markus
b8ec0b20b0 #3700 New Switch EXPENSEREPORT_INVERT_SENDER_RECIPIENT 2019-03-09 18:22:37 +01:00
Laurent Destailleur
441b577599 Add missing trans 2019-03-09 12:58:52 +01:00
Laurent Destailleur
10b9fdc1fd Fix column definition 2019-03-09 02:05:28 +01:00
Laurent Destailleur
799271daa5 Try to add more log to debug expense report creation error 2019-03-09 01:45:11 +01:00
Laurent Destailleur
b710e28ffa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang
2019-03-09 01:20:13 +01:00
Laurent Destailleur
3716834b0a Fix bad var name 2019-03-09 01:13:15 +01:00
Laurent Destailleur
d99f4c1726 Fix var not used 2019-03-09 01:08:50 +01:00
Laurent Destailleur
1a715e794c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 01:06:19 +01:00
Laurent Destailleur
c6d7987b57 FIX method db->active does not exists 2019-03-09 01:06:07 +01:00
Laurent Destailleur
f781bec441
Merge pull request #10781 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2019-03-09 01:02:48 +01:00
Scrutinizer Auto-Fixer
68188ffda1 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-03-09 00:02:05 +00:00
Laurent Destailleur
73b359c124 Fix class visibility 2019-03-09 00:54:10 +01:00
Laurent Destailleur
57b9be53b3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/contrat/class/contrat.class.php
2019-03-09 00:44:31 +01:00
Laurent Destailleur
5596b2e9bf Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2019-03-09 00:02:56 +01:00
Laurent Destailleur
520387c03d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/holiday/card.php
2019-03-09 00:01:29 +01:00
Laurent Destailleur
4022d5f529 FIX Can not create contract with numbering module without autogen rule 2019-03-08 23:58:04 +01:00
Laurent Destailleur
f0c2b3a151 Bette error message 2019-03-08 20:07:22 +01:00
Laurent Destailleur
b766031abf Try to fix error on pgsql 2019-03-08 20:06:09 +01:00
Laurent Destailleur
e38427a41f Fix var not initialized 2019-03-08 19:56:21 +01:00
Laurent Destailleur
233bd4374a Fix phpcs 2019-03-08 19:52:26 +01:00
Laurent Destailleur
eded4c9e35
Merge pull request #10777 from frederic34/patch-4
update doc
2019-03-08 19:41:05 +01:00
Laurent Destailleur
9a5497b940
Merge pull request #10776 from frederic34/patch-3
do not trim int
2019-03-08 19:38:44 +01:00
Laurent Destailleur
fb5757a633
Merge pull request #10775 from frederic34/fourn-html5
replace html by html5 in fourn
2019-03-08 19:36:11 +01:00
Laurent Destailleur
86f4e81a6e
Merge pull request #10773 from frederic34/patch-2
Update stats.class.php
2019-03-08 19:33:40 +01:00
Laurent Destailleur
9c97b2af30
Merge pull request #10769 from altatof/expe
NEW : add product extrafields to shipping export
2019-03-08 19:33:09 +01:00
Laurent Destailleur
a47cc4ef57 Fix script to delete data 2019-03-08 19:26:16 +01:00
markus
ef003cf15c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-08 18:24:20 +01:00
markus
e452a2e31d add bank lib 2019-03-08 18:14:22 +01:00
markus
41c21b88c1 More output 2019-03-08 16:46:08 +01:00
markus
1bf99b81f1 Display more 2019-03-08 16:44:35 +01:00
Markus Welters
fac99ccd98
Merge pull request #2 from countiy/patch-1
expensereport changed IBAN
2019-03-08 16:37:04 +01:00
markus
c595dca5e7 fix typo 2019-03-08 16:35:11 +01:00
Rafael Ingenleuf
a505323fe7 expensereport changed IBAN 2019-03-08 16:27:08 +01:00