Commit Graph

83748 Commits

Author SHA1 Message Date
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
Laurent Destailleur
5a34874b0a
Merge pull request #12752 from OPEN-DSI/v10-fix-project-element-task-urlnew
FIX url new for task time spent in project element tab
2019-12-30 21:47:26 +01:00
Laurent Destailleur
eb659ab68c
Merge pull request #12755 from ATM-Marc/FIX_10.0_margin_error500
FIX: error 500 when getting margin info for objects other than invoices
2019-12-30 21:40:26 +01:00
Laurent Destailleur
defe3b20ec
Merge pull request #12764 from hregis/11.0_bug
FIX avoid php warning
2019-12-30 21:39:43 +01:00
Alexandre SPANGARO
9879a43cf4 NEW Add social networks of the company 2019-12-30 21:17:41 +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
Regis Houssin
71a2998118 FIX wrong var name and avoid warning 2019-12-30 15:36:09 +01:00
TuxGasy
c9cc6cbbea Fix decimal value on update object 2019-12-29 23:15:49 +01:00
stickler-ci
458c1e2174 Fixing style errors. 2019-12-29 19:58:38 +00:00
Guillaume Matheron
84d8ca4b33 Made spaces/tab usage more consistent 2019-12-29 20:47:18 +01:00
Guillaume Matheron
5b1ae96ce9 Added two new options when billing time spent on a project :
- Create one invoice line per timespent entry

 - Create one invoice line per task
2019-12-29 20:46:53 +01:00
Maxime Kohlhaas
7025d3839a Remove € + unsed code and file 2019-12-29 09:56:03 +01:00
Alexandre SPANGARO
a804208b32 Fix missing language key 2019-12-27 20:54:47 +01:00
Regis Houssin
c76edb20d7 FIX avoid php warning 2019-12-27 12:20:38 +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
VESSILLER
9c4d7044a3 FIX sql bad request in product buying price extrafields 2019-12-26 16:18:26 +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
Alexandre SPANGARO
9a7307eea8 FIX Missing language key for MAIN_MAXTABS_IN_CARD 2019-12-26 12:01:09 +01:00
VESSILLER
811adad8c8 FIX notice var nbfield of array not initialized 2019-12-26 10:34:10 +01:00
VESSILLER
046aba8abd FIX indented errors 2019-12-26 10:14:05 +01:00