Commit Graph

70314 Commits

Author SHA1 Message Date
Laurent Destailleur
23ffac3bf2
Merge pull request #9770 from Dolibarr/revert-9764-patch-71
Revert "FIX and dolibarize"
2018-10-16 19:21:35 +02:00
Laurent Destailleur
5a4338ad1d
Revert "FIX and dolibarize" 2018-10-16 19:20:51 +02:00
Laurent Destailleur
a7c94ea068
Merge pull request #9764 from ptibogxiv/patch-71
FIX and dolibarize
2018-10-16 19:19:13 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
08fa0deb24 FIX Bad label on delete button 2018-10-16 18:41:50 +02:00
Laurent Destailleur
502c52b78f Show real path of module if not into custom 2018-10-16 18:09:43 +02:00
Laurent Destailleur
f5029bf52b Fix template 2018-10-16 17:46:14 +02:00
Laurent Destailleur
96fce2828e Prepare 9.0 2018-10-16 17:02:36 +02:00
ptibogxiv
dc0aaf48d7
FIX and dolibarize 2018-10-16 16:08:20 +02:00
Laurent Destailleur
4bdcb17694 Trans 2018-10-16 15:38:26 +02:00
Laurent Destailleur
70366e9d91 Missing translation 2018-10-16 03:31:33 +02:00
Laurent Destailleur
35f9371343 Fix missing es translation string 2018-10-16 03:30:17 +02:00
Laurent Destailleur
12cb60040b Fix multilang 2018-10-16 01:52:22 +02:00
Laurent Destailleur
c8607a74bf Load websitepage 2018-10-16 01:39:04 +02:00
Laurent Destailleur
568197656f Fix canonical of home 2018-10-15 21:43:01 +02:00
Laurent Destailleur
c246ef38c0 Fix canonical 2018-10-15 21:42:43 +02:00
Laurent Destailleur
96ddebad4a Set canonical tag 2018-10-15 17:48:39 +02:00
Laurent Destailleur
743d4d7c01 NEW add option PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT 2018-10-15 16:40:40 +02:00
Laurent Destailleur
970c581bc9 css 2018-10-15 16:40:07 +02:00
Laurent Destailleur
6d4d8a0342 Dolibarize data privacy policy module 2018-10-15 14:05:54 +02:00
Laurent Destailleur
a20498126a Fix init var 2018-10-15 13:40:22 +02:00
Laurent Destailleur
4cd7119d1c Not used var 2018-10-15 13:38:50 +02:00
Laurent Destailleur
5d9b770511 phpcs 2018-10-15 13:32:09 +02:00
Laurent Destailleur
df4b3b09d2 Fix var not defined 2018-10-15 13:30:07 +02:00
Laurent Destailleur
cca87f3d5a Fix phpcs 2018-10-15 13:27:17 +02:00
Laurent Destailleur
6ab037c766 Fix code comment 2018-10-15 13:26:18 +02:00
Laurent Destailleur
f59dba66e7 Fix phpcs 2018-10-15 13:23:35 +02:00
Laurent Destailleur
2684767b19 Fix pagination
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
2018-10-15 11:08:40 +02:00
Laurent Destailleur
e29fb85cec Fix limit 2018-10-15 11:07:16 +02:00
Laurent Destailleur
aa6996e2d0 Fix pagination show two times the same account on balance of accounts 2018-10-15 11:07:07 +02:00
Laurent Destailleur
9afc53ca06 Fix remove step in accountancy if module expense report not used 2018-10-15 11:05:20 +02:00
Laurent Destailleur
47d98ab69d FIX content lost when editing a label with " 2018-10-15 11:05:04 +02:00
Laurent Destailleur
30072a98e9 FIX content lost when editing a label with " 2018-10-15 11:04:29 +02:00
Laurent Destailleur
0a8f305151 Trans 2018-10-15 02:40:49 +02:00
Laurent Destailleur
c881be847d Fix remove step in accountancy if module expense report not used 2018-10-15 01:47:44 +02:00
Laurent Destailleur
35eeb32f5d Fix pagination 2018-10-15 00:08:28 +02:00
Laurent Destailleur
b13d9650f2 Fix pagination 2018-10-15 00:06:16 +02:00
Laurent Destailleur
995f4fa35f Fix limit 2018-10-14 23:57:07 +02:00
Laurent Destailleur
8fc73d1b1b Fix pagination show two times the same account on balance of accounts 2018-10-14 23:47:38 +02:00
Laurent Destailleur
ab807ada07 Work on translation 2018-10-14 23:26:57 +02:00
Laurent Destailleur
ac143b28ae Work on multilang 2018-10-14 20:54:28 +02:00
Laurent Destailleur
45860b2494 Work on multilang 2018-10-14 20:04:25 +02:00
Laurent Destailleur
b0569de166 Work on multilang support 2018-10-14 18:44:29 +02:00
Laurent Destailleur
484ac2cd9b
Merge pull request #8714 from defrance/patch-112
NEW Add hook for virtual stock
2018-10-14 16:48:00 +02:00
Laurent Destailleur
7e68d8df1b
Update product.class.php 2018-10-14 16:47:30 +02:00
Laurent Destailleur
5654492ba8
Update product.class.php 2018-10-14 16:45:45 +02:00
Laurent Destailleur
db2e1e09e7
Merge branch 'develop' into patch-112 2018-10-14 16:44:36 +02:00
Laurent Destailleur
abf8867061
Merge pull request #8207 from atm-john/New_invoice_default_documents
NEW hidden option to define an invoice template for each invoice type
2018-10-14 16:36:37 +02:00
Laurent Destailleur
747a2a8ae0
Merge pull request #9741 from frederic34/preparehead
fix standard prepare_head
2018-10-14 16:28:02 +02:00
Laurent Destailleur
6aa70e8933 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-14 16:10:13 +02:00