lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
82,176 Commits 43 Branches 150 Tags 886 MiB
671daafb52
Commit Graph

82176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume Matheron
671daafb52 Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop 2020-01-02 15:26:48 +01:00
Guillaume Matheron
9efdec6c6e Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop 2020-01-02 15:26:28 +01:00
Guillaume Matheron
42ba6ab9ba Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop 2020-01-02 15:18:26 +01:00
Guillaume Matheron
19e69dc869 Creating invoice from time spent now takes in to account the product duration to compute the quantity to bill 2020-01-02 15:18:18 +01:00
stickler-ci
92f50f6357 Fixing style errors. 2020-01-02 14:00:39 +00:00
Guillaume Matheron
e9e0aae1ce Added option to bill time spent on a task to an existing draft invoice (for instance a recurrent bill) 2020-01-02 14:59:53 +01:00
Guillaume Matheron
4f65f8d095 Fixed bug (missing include) in formmargin.class.php, affecting display of propal 2020-01-02 14:13:26 +01:00
root
93b894bf92 Merge remote-tracking branch 'upstream/develop' into develop 2020-01-02 13:56:09 +01:00
Laurent Destailleur
aa13eb7ac4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 23:14:33 +01:00
Laurent Destailleur
b98251f7b0 Fix phpcs 2020-01-01 23:14:13 +01:00
Laurent Destailleur
9200d7f2d7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 23:02:02 +01:00
Laurent Destailleur
607d013a9d Fix phpcs 2020-01-01 23:01:42 +01:00
Laurent Destailleur
b90dbb585a Fix ident 2020-01-01 22:45:47 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
e7ac01e1bd FIX localtax info were not returned correctly when call done with id. 2020-01-01 22:27:47 +01:00
Laurent Destailleur
85d3b424f7 FIX: Substitution of login into link is wrong. 2020-01-01 22:27:08 +01:00
Laurent Destailleur
d3d7592072 FIX Warning for some country must appears if company is in this country. 2020-01-01 22:26:47 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
Laurent Destailleur
b50cb2a65d Fix solution to solve a blocking situation (credit note both refunded 
and consumed)
 2020-01-01 19:04:14 +01:00
Laurent Destailleur
ce7360ced3 Code comment 2020-01-01 18:43:46 +01:00
Laurent Destailleur
84d0ae7ac5 Trans 2020-01-01 17:31:48 +01:00
Laurent Destailleur
90a78267c5 Trans 2020-01-01 17:31:29 +01:00
Laurent Destailleur
7d07c198bc FIX Price of purchase order and vendor invoice with multicurrency 
FIX entering predefined product with a forced unit price
 2020-01-01 17:15:26 +01:00
Laurent Destailleur
cc8f3f7258 Fix var not defined 2020-01-01 16:41:01 +01:00
Laurent Destailleur
2ac6a8a3db Fix ping after update 2020-01-01 14:30:16 +01:00
Laurent Destailleur
3d98863092 Fix bad position of lang loading 2020-01-01 13:51:14 +01:00
Laurent Destailleur
bf9f9df50f Fix var not defined 2020-01-01 13:46:09 +01:00
Laurent Destailleur
d175b34323 Fix log 2020-01-01 13:22:20 +01:00
Laurent Destailleur
821ff375b0 Fix update ref 2020-01-01 13:15:42 +01:00
Laurent Destailleur
6fdb5d8e33 FIX ref 2020-01-01 13:14:00 +01:00
Laurent Destailleur
e4a03e98b7 FIX Do not record resource owner of event when not defined. 
More log to track payment errors.
 2020-01-01 12:47:01 +01:00
Laurent Destailleur
fe7f0ce600 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 11:24:19 +01:00
Laurent Destailleur
eae0800021 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 11:24:10 +01:00
Laurent Destailleur
3825e9af06 FIX logo not found in some cases 2020-01-01 03:00:10 +01:00
Laurent Destailleur
f8c15a14cf Add try catch 2019-12-31 19:11:36 +01:00
Laurent Destailleur
c0c413b219 Alignement 2019-12-31 18:32:57 +01:00
Laurent Destailleur
4e2bc6a741 Fix alignment 2019-12-31 18:23:56 +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