Commit Graph

82126 Commits

Author SHA1 Message Date
Laurent Destailleur
012db1b021
Merge pull request #12762 from manu-971/develop
New Ref more visible when create a ticket
2019-12-31 17:21:21 +01:00
Laurent Destailleur
be5a254c74
Merge pull request #12775 from jonbk/fix/issue-12774
Fix #12774 Fix undefined facid GET parameter
2019-12-31 17:21:03 +01:00
Laurent Destailleur
76052b8bb4 FIX Avoid line feed when 100% 2019-12-31 17:19:49 +01:00
Laurent Destailleur
0c05d02265
Merge pull request #12777 from jerash/develop
add credit notes and deposit to getListOfPayments
2019-12-31 17:15:10 +01:00
Laurent Destailleur
bd4894d7cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-31 17:10:53 +01:00
stickler-ci
6142e42d83 Fixing style errors. 2019-12-31 16:10:36 +00:00
Laurent Destailleur
5a692cecfb Code comment 2019-12-31 17:10:36 +01:00
Laurent Destailleur
9774b05f52
Update commoninvoice.class.php 2019-12-31 17:10:03 +01:00
Laurent Destailleur
a369690e16
Update commoninvoice.class.php 2019-12-31 17:07:56 +01:00
stickler-ci
d3ec867df5 Fixing style errors. 2019-12-31 16:07:07 +00:00
Laurent Destailleur
b3373e8ba5
Update commoninvoice.class.php 2019-12-31 17:06:30 +01:00
Laurent Destailleur
c341ad5e8d
Update commoninvoice.class.php 2019-12-31 17:03:00 +01:00
Laurent Destailleur
f11a119ab0 Clean dead code 2019-12-31 16:50:21 +01:00
Laurent Destailleur
5dbf7869d4
Merge pull request #12778 from aspangaro/9.0_p4
Fix Accountancy - Set NULL when data is empty
2019-12-31 16:40:05 +01:00
Laurent Destailleur
513b9b26a6
Merge branch 'develop' into 9.0_p4 2019-12-31 16:38:37 +01:00
Laurent Destailleur
99f9341d08
Merge pull request #12782 from frederic34/patch-13
Update doc_generic_contract_odt.modules.php
2019-12-31 16:34:44 +01:00
Frédéric FRANCE
a7a474d032
Update doc_generic_contract_odt.modules.php 2019-12-31 14:28:14 +01:00
Alexandre SPANGARO
77e3b01179 Fix Accountancy - Set NULL when data is empty 2019-12-31 08:00:20 +01:00
stickler-ci
73e0bca359 Fixing style errors. 2019-12-31 00:13:42 +00:00
jerash
411f20c360
add credit notes and discounts to getListOfPayments 2019-12-31 01:08:25 +01:00
Laurent Destailleur
4ade8642b1
Merge pull request #12773 from camlafit/patch-1
NEW Use native --convert-to feature to convert to pdf
2019-12-30 22:40:06 +01:00
Laurent Destailleur
fc49825eaa
Merge pull request #12659 from andreubisquerra/master
NEW: Takepos supplements
2019-12-30 22:07:19 +01:00
Laurent Destailleur
945296bb55
Merge pull request #12690 from atm-greg/Hook_on_ics_generation
NEW hook on ics generation to add more events in eventarray
2019-12-30 22:03:07 +01:00
Jonathan Buyck
c78e4b8965 fix undefined facid 2019-12-30 19:57:24 +01:00
Km
a2d6fbf3d8
Use native --convert-to feature to convert to pdf
We last office release we can use their native feature

* https://ask.libreoffice.org/en/question/2641/convert-to-command-line-parameter/
* https://stackoverflow.com/questions/30349542/command-libreoffice-headless-convert-to-pdf-test-docx-outdir-pdf-is-not
2019-12-30 17:25:54 +01:00
Manu Bryk
0b6124f804 New Ref more visible when create a ticket
When customers call support to trace a ticket, they don't have easily ref of the ticket. Add Ref to the subject of mail for customers and for TICKET_NOTIFICATION_EMAIL_TO. Add ref also to the notification message when customers create a new ticket.
2019-12-27 00:11:49 +01:00
Laurent Destailleur
ece8390277 Add tables to store translation of all objects (like llx_product_lang) 2019-12-26 13:23:18 +01:00
Laurent Destailleur
ea4c236311 fix alignment 2019-12-26 13:05:03 +01:00
Laurent Destailleur
4333cf2040 Show the stripe accoutn of a cu_ and a card_ 2019-12-24 12:53:10 +01:00
Laurent Destailleur
6f97d163f9 Fix: the stripe_account is not filled 2019-12-23 22:41:34 +01:00
Laurent Destailleur
85f3f553c2 Fix travis 2019-12-23 20:32:44 +01:00
Laurent Destailleur
d4f3d14b65 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 19:19:10 +01:00
Laurent Destailleur
9f5029aa0f Fix warning 2019-12-23 19:17:53 +01:00
Laurent Destailleur
14c510f4be Remove php 5.5 2019-12-23 19:14:00 +01:00
Laurent Destailleur
094b37d79d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 19:12:32 +01:00
Laurent Destailleur
8e78dbad69 Fix for php 7.4 2019-12-23 16:41:22 +01:00
Laurent Destailleur
f193d3edd8 Fix for php7.4 2019-12-23 16:38:37 +01:00
Laurent Destailleur
d24da57498 Update changelog 2019-12-23 16:26:42 +01:00
Laurent Destailleur
908e8be0da PHP Min bill 5.6 for Dolibarr 12 2019-12-23 16:25:45 +01:00
Laurent Destailleur
c8a39cec1c Try php 7.4 2019-12-23 16:04:35 +01:00
Laurent Destailleur
111fda9aa6 Try php 7.4 2019-12-23 16:03:20 +01:00
Laurent Destailleur
92708e31ce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 15:51:59 +01:00
Laurent Destailleur
f45710a4b1 Fix phpcs 2019-12-23 15:51:23 +01:00
Laurent Destailleur
1ebf7e642f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 15:49:25 +01:00
Laurent Destailleur
330cca994e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
Laurent Destailleur
d5f6ccc7a0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 14:40:36 +01:00
Laurent Destailleur
29cacec886 Fix month when using "Now" button addnowlink = 2 2019-12-23 14:39:24 +01:00
Laurent Destailleur
f09aecbdd8 v12 2019-12-23 14:28:55 +01:00
Laurent Destailleur
07c1a5717e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/facture_situation.php
	htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00