Laurent Destailleur
103f41f571
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-31 18:22:34 +01:00
Laurent Destailleur
d2efe1d427
Fix SQL injection on type parameter in list of events
2019-12-31 17:52:28 +01:00
Laurent Destailleur
31c5f4eb0b
Merge pull request #12748 from OPEN-DSI/v10-fix-projet-element-linkto
...
FIX remove backward compatibility projectid and uses object id instead
2019-12-31 17:40:01 +01:00
Laurent Destailleur
ff1c96f985
Merge pull request #12753 from aspangaro/10.0_p9
...
FIX : Some issues on salary payment
2019-12-31 17:39:08 +01:00
Laurent Destailleur
4c6c8e172f
Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class
...
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04
FIX #12760 #12763 #12755 #12765 #12751
2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:26:02 +01:00
Manu Bryk
14d69c5a2c
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-31 17:24:37 +01:00
Jonathan Buyck
3b6936176a
fix undefined facid
2019-12-31 17:24:27 +01:00
Laurent Destailleur
15f1153e82
FIX Avoid line feed when 100%
2019-12-31 17:22:12 +01:00
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
Laurent Destailleur
9a8459e494
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2019-12-31 14:49:21 +01:00
Laurent Destailleur
175894db26
FIX Status of direct debit payment after setting to paid.
2019-12-31 14:48:52 +01:00
Frédéric FRANCE
530eeffed7
NEW upload odt templates for sendings
2019-12-31 14:30:57 +01:00
Frédéric FRANCE
a7a474d032
Update doc_generic_contract_odt.modules.php
2019-12-31 14:28:14 +01:00
Frédéric FRANCE
57a5416cbc
Update doc_generic_proposal_odt.modules.php
2019-12-31 14:20:39 +01:00
Frédéric FRANCE
ee7fe66749
Update doc_generic_order_odt.modules.php
2019-12-31 14:19:31 +01:00
Frédéric FRANCE
596e2ccefc
Update doc_generic_invoice_odt.modules.php
2019-12-31 14:15:17 +01:00
Frédéric FRANCE
0c58df51d9
Update doc_generic_odt.modules.php
2019-12-31 14:14:30 +01:00
Frédéric FRANCE
b6f7394959
NEW upload odt models for invoices
2019-12-31 14:13:10 +01:00
Frédéric FRANCE
95335f402e
NEW upload odt models for thirdparties
2019-12-31 14:03:08 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Alexandre SPANGARO
77e3b01179
Fix Accountancy - Set NULL when data is empty
2019-12-31 08:00:20 +01:00
Alexandre SPANGARO
1f282ad0e4
Merge branch 'develop' into 12.0_a1
2019-12-31 06:48:04 +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
8838dc38db
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
2019-12-30 22:25: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
Laurent Destailleur
10d6d00c17
Merge pull request #12749 from OPEN-DSI/v10-fix-admin-dict-transkey-not-defined
...
FIX var transkey not defined in input hidden
2019-12-30 22:01:16 +01:00
Laurent Destailleur
6e90e81be1
Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class
...
FIX class Facture undefined in displaying margin information
2019-12-30 22:00:28 +01:00
Laurent Destailleur
b067653070
Merge pull request #12757 from aspangaro/10.0_p12
...
FIX Missing language key for MAIN_MAXTABS_IN_CARD
2019-12-30 21:59:32 +01:00
Laurent Destailleur
aa390b8c3c
Merge pull request #12771 from tuxgasy/10.0_Fix_double_value_on_update_object
...
Fix decimal value on update object
2019-12-30 21:50:53 +01:00
Laurent Destailleur
e2c7ee7d09
Merge pull request #12772 from hregis/10.0_mc
...
FIX wrong var name and avoid warning
2019-12-30 21:48:56 +01:00
