Commit Graph

64762 Commits

Author SHA1 Message Date
Conspir3D
07772ce2f5
Fix label generation for fichinter card
Fix label generation for fichinter card generation from order. Labels get concatenated.
2018-01-19 12:28:52 +01:00
Jan Giebels
9642206bd1 Fix label generation for fichinter card generation from order. Labels get concatenated. 2018-01-19 12:21:42 +01:00
Laurent Destailleur
a892a3fe71 Fix info of collation is wrong on log 2018-01-19 12:10:03 +01:00
Laurent Destailleur
937a27396f Fix log of install disappear. 2018-01-19 11:43:55 +01:00
Jan Giebels
d01a8d0508 Added order status =1 or =2 for overview 2018-01-19 11:22:25 +01:00
Conspir3D
15e1c5d1ad
Merge pull request #1 from Dolibarr/develop
Fix status was not refreshed
2018-01-19 11:11:53 +01:00
All-3kcis
a58a3f893d Fix #8058 2018-01-19 10:21:48 +01:00
De Coninck Laurent
4874d08062 fix the bill replacement with discounts #8028 2018-01-19 09:01:37 +01:00
Laurent Destailleur
d967527b58 Fix status was not refreshed 2018-01-18 18:40:01 +01:00
Laurent Destailleur
768c93a707 Fix suggested amount for direct debit order 2018-01-18 18:22:10 +01:00
Laurent Destailleur
1730feeb4f Fix error message 2018-01-18 17:52:48 +01:00
Maxime Kohlhaas
4c0dc21ca0 Fix validate contrat was not using force_number parameter 2018-01-18 14:07:32 +01:00
Laurent Destailleur
3871c694f6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-17 19:50:33 +01:00
Laurent Destailleur
57f664c0c1 Fix vat npr for template invoices 2018-01-17 19:45:23 +01:00
Laurent Destailleur
4034122169 Fix usage of PAYMENT_SECURITY_TOKEN 2018-01-17 18:00:05 +01:00
Darkjeff
f9d02628de Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-17 17:29:27 +01:00
Laurent Destailleur
81999be027 Fix lose filter type 2018-01-17 17:29:17 +01:00
Laurent Destailleur
756838c3a0 Fix lose filter type 2018-01-17 17:13:50 +01:00
Darkjeff
e8b27c8e66 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-17 17:06:12 +01:00
Laurent Destailleur
56d702e3c6 Fix missing property in tooltip 2018-01-17 16:26:24 +01:00
Laurent Destailleur
bc7bd77cea Fix permission to open supplier order 2018-01-17 15:54:27 +01:00
Laurent Destailleur
1e9ddf153c Fix workboard not visible on smartphone, so i invert position with stats 2018-01-17 13:55:53 +01:00
Laurent Destailleur
dcd579242f Fix <br /> (xml) into <br> (html) 2018-01-17 13:26:57 +01:00
Laurent Destailleur
2e0ec5e76a Fix <br> 2018-01-17 13:17:33 +01:00
Laurent Destailleur
be821716f0 code comment 2018-01-17 12:26:20 +01:00
Laurent Destailleur
90e579b884 Update doxygen 2018-01-17 11:49:06 +01:00
Laurent Destailleur
0a85a4702a Fix https 2018-01-17 11:41:03 +01:00
Laurent Destailleur
ef5939fe78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-17 11:20:32 +01:00
Laurent Destailleur
1a04178d64 Clean unused file and fix missing translation 2018-01-17 11:20:18 +01:00
Darkjeff
5f1a95e5d7 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-17 08:48:54 +01:00
Laurent Destailleur
3f551f0d05 Fix migration 2018-01-17 02:19:32 +01:00
Laurent Destailleur
a84ed841cc Fix creation date was not filled 2018-01-16 20:47:33 +01:00
Laurent Destailleur
26ba0a9ec2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/cashdesk/index.php
	htdocs/compta/index.php
	htdocs/core/lib/security.lib.php
	htdocs/societe/list.php
2018-01-16 20:23:32 +01:00
Laurent Destailleur
5d4eda68e0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-16 19:53:02 +01:00
Laurent Destailleur
94b1d59f2b Fix missing check on object entity 2018-01-16 19:52:14 +01:00
Laurent Destailleur
59eefa46e6 Fix duplicate search field 2018-01-16 18:02:36 +01:00
Darkjeff
69ab7542d0 Merge branch 'develop' of https://github.com/Darkjeff/dolibarr into develop 2018-01-16 17:51:00 +01:00
Darkjeff
0a1fec42a2 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-16 17:50:46 +01:00
Darkjeff
73c0a96d1b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-16 16:52:05 +01:00
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +01:00
Laurent Destailleur
f307fecaf6
Merge pull request #8064 from atm-quentin/6.0
FIX missing hook invoice index
2018-01-16 12:15:06 +01:00
Laurent Destailleur
51421a8bf6 Fix position of fields 2018-01-15 18:11:56 +01:00
Laurent Destailleur
25d59cf107 Fix sort on common fields 2018-01-15 18:05:15 +01:00
Laurent Destailleur
3d34a839a3 Doc 2018-01-15 17:43:18 +01:00
Laurent Destailleur
926683763b Modulebuilde fix sort of fields, fix generation of files 2018-01-15 17:38:15 +01:00
atm-quentin
6feacab4f5 FIX missing hook invoice index 2018-01-15 14:24:19 +01:00
Darkjeff
608aa54517 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-15 13:14:31 +01:00
Laurent Destailleur
bc2009874d Fix code comment 2018-01-15 12:59:30 +01:00
Darkjeff
9f2ecdd06f Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2018-01-15 12:53:25 +01:00
Laurent Destailleur
4c8af0ff50 Fix name alias on list 2018-01-15 12:24:56 +01:00