Commit Graph

74556 Commits

Author SHA1 Message Date
Laurent Destailleur
f22e4980fe Update doc 2019-03-16 23:29:27 +01:00
Laurent Destailleur
f6285e7daf Fix phpcs 2019-03-16 23:19:34 +01:00
Laurent Destailleur
9a132d9691 Fix phpcs 2019-03-16 23:17:23 +01:00
Laurent Destailleur
dabccb7967 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/fourn/facture/paiement.php
2019-03-16 20:12:53 +01:00
Laurent Destailleur
01cd40d5c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-16 20:10:36 +01:00
Laurent Destailleur
95c1275efc Fix phpcs 2019-03-16 20:10:22 +01:00
Laurent Destailleur
8adc333823 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-16 19:41:50 +01:00
Laurent Destailleur
468af5380f
Merge pull request #10857 from atm-maxime/fix_creditnote_refund
Fix #9961 : deal with supplier credit note refund like with customers
2019-03-16 19:40:22 +01:00
Laurent Destailleur
8b3ba0da7b
Merge pull request #10859 from frederic34/patch-4
phpcs fix autoloader.php
2019-03-16 19:39:40 +01:00
Laurent Destailleur
85b09de61f
Merge branch 'develop' into patch-4 2019-03-16 19:39:33 +01:00
Laurent Destailleur
69735527ca
Merge pull request #10858 from frederic34/patch-2
phpcs fix
2019-03-16 19:38:36 +01:00
Laurent Destailleur
4d101c7d9a Fix phpcs 2019-03-16 19:37:54 +01:00
Frédéric FRANCE
db0108b0e9
Update autoloader.php 2019-03-16 19:14:31 +01:00
Frédéric FRANCE
5e6d9691e4
phpcs fix 2019-03-16 19:12:45 +01:00
Maxime Kohlhaas
46b39dd6a9 Fix #9961 : deal with supplier credit note refund like with customers 2019-03-16 18:13:43 +01:00
Laurent Destailleur
c2badb57d7 NEW: Add module debugbar 2019-03-16 16:27:14 +01:00
Laurent Destailleur
0ecdb246e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-16 14:48:50 +01:00
Laurent Destailleur
e5567c7ee4 Fix typo 2019-03-16 14:48:41 +01:00
Laurent Destailleur
ce8caabd62
Merge pull request #7411 from joseplluis/patch-1
Fix: Custom info view in services
2019-03-16 14:23:06 +01:00
Laurent Destailleur
e7543a26b1
Merge branch 'develop' into patch-1 2019-03-16 14:22:36 +01:00
Laurent Destailleur
fee40d62f1
Merge pull request #10856 from frederic34/patch-2
Update doc in accountancycategory.class.php
2019-03-16 13:50:39 +01:00
Laurent Destailleur
55718cc7da
Merge pull request #10855 from atm-maxime/fix_missing_lang
Fix #9311
2019-03-16 13:43:35 +01:00
Laurent Destailleur
efeb7b0c22
Merge pull request #10854 from atm-maxime/fix_civility_third_creation
Fix #10177
2019-03-16 13:41:29 +01:00
Frédéric FRANCE
4822a2d396
Update accountancycategory.class.php 2019-03-16 09:51:57 +01:00
Maxime Kohlhaas
21e2d36421 Fix #9311 2019-03-16 09:28:47 +01:00
Maxime Kohlhaas
68945c7d51 Fix #10177 2019-03-16 09:11:43 +01:00
Laurent Destailleur
40c2ca4310 Fix label of status of third party record when using smartphone 2019-03-15 23:08:00 +01:00
Laurent Destailleur
7a5a561170 Fix label of status of invoice record when using smartphone 2019-03-15 23:00:50 +01:00
Laurent Destailleur
7cdfff7263 Fix syntax error 2019-03-15 20:42:49 +01:00
Laurent Destailleur
91f80934f3 Fix: On smartphone, hide label of status only on lists. 2019-03-15 20:39:55 +01:00
Laurent Destailleur
f0796d152f Responsive 2019-03-15 20:23:34 +01:00
Laurent Destailleur
b6cacf3a20 Fix label of status for members on smartphone 2019-03-15 20:18:35 +01:00
Laurent Destailleur
d512e54407 Restore toggle of login_block because it was no more visible 2019-03-15 20:10:39 +01:00
Laurent Destailleur
bede7b80a2 Fix smartphone 2019-03-15 20:09:42 +01:00
Laurent Destailleur
04424ed882 FIX Bad label of status for members (must be short version in list)
Conflicts:
	htdocs/adherents/class/adherent.class.php
2019-03-15 20:07:42 +01:00
Laurent Destailleur
af6508b1c8 FIX Bad label of status for members (must be short version in list) 2019-03-15 20:06:05 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
5027a36dfb Fix missing transaction on add_commercial method. 2019-03-15 19:34:04 +01:00
Laurent Destailleur
c72cd7e750
Merge pull request #10807 from altatof/ste
change add_commercial function signature
2019-03-15 19:26:12 +01:00
Laurent Destailleur
875b5b6a8d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/opensurvey/studs.php
2019-03-15 19:20:22 +01:00
Laurent Destailleur
39e24d30aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:18:30 +01:00
Laurent Destailleur
681d626284 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:17:31 +01:00
Laurent Destailleur
4bb45ad1c1
Merge pull request #10824 from atm-gauthier/7.0_fix_nocreateline_deposit_if_amount_zero
FIX : when we create deposit with multi tva, we mustn't add line if a…
2019-03-15 19:16:56 +01:00
Laurent Destailleur
b33c366b02
Update card.php 2019-03-15 19:16:49 +01:00
Laurent Destailleur
2e94f8043f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:14:02 +01:00
Laurent Destailleur
abf529770d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:13:23 +01:00
Laurent Destailleur
482a37a2c9
Merge pull request #10850 from atm-ph/fix_7.0_var_name
Fix var name
2019-03-15 19:12:55 +01:00
Laurent Destailleur
a1adcc785c Clean code 2019-03-15 19:11:24 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
6ecd37ea8f WIP Clean code of BOM 2019-03-15 18:16:25 +01:00