Commit Graph

59305 Commits

Author SHA1 Message Date
Laurent Destailleur
92d7b907be Merge pull request #6844 from defrance/patch-10
problems with additionnal template type
2017-05-18 17:48:30 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
5a79d11389 Avoid warning 2017-05-18 13:14:56 +02:00
Laurent Destailleur
dff7d00d2b Look and feel v6 2017-05-18 13:13:18 +02:00
Laurent Destailleur
eaa4b650f8 Code comment 2017-05-18 13:01:48 +02:00
Laurent Destailleur
4a46480ef5 Fix preview of PDF contract 2017-05-18 12:40:20 +02:00
Laurent Destailleur
a36a9fab2f Look and feel v6 2017-05-18 12:12:36 +02:00
Laurent Destailleur
0b52c43e05 Fix bad selection of progress when not known 2017-05-18 11:35:12 +02:00
Laurent Destailleur
1a1b27d68c Fix input of duration 2017-05-18 11:13:18 +02:00
Laurent Destailleur
fbb3406c5d Fix missing filters 2017-05-18 10:46:55 +02:00
Laurent Destailleur
ff5d682d49 Fix css 2017-05-18 03:12:29 +02:00
Laurent Destailleur
58f789659d Remove one picto loading 2017-05-18 02:53:49 +02:00
Laurent Destailleur
f3838ee8f2 Fix limit into message 2017-05-17 18:52:01 +02:00
Laurent Destailleur
c224e2b4f6 Remove table that does not exists 2017-05-17 16:05:26 +02:00
Laurent Destailleur
1d6b4cb28a Look and feel v6 2017-05-17 15:25:09 +02:00
Laurent Destailleur
a8afa547f0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture.php
2017-05-17 15:20:17 +02:00
Laurent Destailleur
56989ae5af Add missing fields making not possible to enter reference price of
products into another currency
2017-05-17 15:10:45 +02:00
Laurent Destailleur
e2a7b0943f Clean dead code 2017-05-17 14:52:27 +02:00
Laurent Destailleur
1f1d92d858 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-17 14:45:37 +02:00
Laurent Destailleur
d86b42b024 Missing title, bad css 2017-05-17 14:45:08 +02:00
Laurent Destailleur
7931c548c7 Better translation 2017-05-16 23:58:42 +02:00
Laurent Destailleur
b29f325fcf Work on search criteria persistence 2017-05-16 23:38:23 +02:00
Laurent Destailleur
b0f0285137 Standardize code 2017-05-16 21:29:18 +02:00
Laurent Destailleur
d110292a1b Uniformize code 2017-05-16 17:49:38 +02:00
Laurent Destailleur
9870cafea3 Better translation 2017-05-16 16:40:03 +02:00
Laurent Destailleur
194ed505f4 Look and feel v6 2017-05-16 14:05:46 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
cc16bb0bef Debug default value feature. 2017-05-16 12:22:55 +02:00
Laurent Destailleur
cc95e046e5 NEW Can sort customer balance summary on date 2017-05-16 03:34:49 +02:00
Laurent Destailleur
ab444ce730 Prepare for module collab/pad 2017-05-16 03:02:00 +02:00
Laurent Destailleur
ce84990414 NEW On invoices generated by template, we save if of source template. 2017-05-16 02:46:19 +02:00
Laurent Destailleur
789fbb6dc3 Enhance tooltips 2017-05-15 12:57:08 +02:00
Laurent Destailleur
f2aa0ea488 Look and feel v6 2017-05-15 10:39:14 +02:00
Laurent Destailleur
b3245fb455 NEW Include an hourglass icon when we click on online payment button 2017-05-15 10:27:21 +02:00
Alexandre SPANGARO
becd023032 Fix : tooltip on supplier invoice payment 2017-05-15 05:11:00 +02:00
Laurent Destailleur
b29d0385e6 NEW Can send an email to a user from its card. 2017-05-15 00:15:56 +02:00
Alexandre SPANGARO
4dc7d5cd8d Fix : tooltip on bank in customer invoice card 2017-05-14 21:20:35 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Alexandre SPANGARO
cedf5fb0ed Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 2017-05-14 20:29:46 +02:00
Laurent Destailleur
caae7e4171 NEW It's easier to switch between sandbox and live for paypal 2017-05-14 17:05:13 +02:00
Laurent Destailleur
998254d9c6 Finish rewrite and debug of module Stripe. 2017-05-14 16:17:23 +02:00
BENKE Charlie
8e68aa86ac problems with additionnal template type
If i active my new xml templater, and keep odt, the odt folder is added on folder to scan on my xml path
ex : 
odt folder defined : c:\toto
xml folder defined : c:\tata

folder scanned with odt :  c:\toto
folder scanned with odt :  c:\toto,c:\tata
2017-05-14 15:17:40 +02:00
Laurent Destailleur
9b550ae178 Fix migration of accountancy_journal from char to num. 2017-05-14 12:54:26 +02:00
Alexandre SPANGARO
143c019905 Fix : Sql error on salaries index for accountancy multijournal + debug 2017-05-14 08:07:34 +02:00
Laurent Destailleur
9e4e72baee Enhance module stripe 2017-05-14 05:26:19 +02:00
Laurent Destailleur
169e63d49a Fix set of background for left menu 2017-05-13 22:23:03 +02:00
Laurent Destailleur
0ed4b607b2 Standardize code for payment 2017-05-13 22:17:39 +02:00
Laurent Destailleur
8dcec30d89 Start debug of module stripe 2017-05-13 21:17:08 +02:00
Laurent Destailleur
955c9f4217 Standardize the way online payments are working.
Removed the trigger file of PAYPAL module that stored data that was not
used by Dolibarr. The trigger event still exists, but if an external
module need action on it, it must provides itself its trigger file.
2017-05-13 21:10:56 +02:00
Laurent Destailleur
1d0e9b0a59 Merge pull request #6828 from atm-alexis/FIX_situation_invoice_allpercent
FIX situation invoice broken
2017-05-13 20:14:48 +02:00