Laurent Destailleur
247c380d18
Several fixes
2017-12-12 16:11:40 +01:00
Laurent Destailleur
5980651103
Merge branch 'develop' into develop
2017-09-21 11:41:30 +02:00
Laurent Destailleur
aba907d1a8
FIX #7420
2017-09-18 15:49:21 +02:00
mikee2
6a35047020
Updated to use dolibarr timme functions
...
Redefined macro strings to adapt to dolibarr date functions return values. Keep same macro names when possible to avoid breaking existing code. Some macro holders (not commonly used) have been dropped because non existing values in dolibarr date functions.
Per eldy request changed php date functions with dolibarr's internal date functions to match users time zone. Now dates are those of the user's timezone so check that is is correctly defined in user's profile.
2017-06-14 12:53:29 +02:00
mikee2
637e1a8d21
Update Segment.php
...
Add additional needed fields so that you can invoice yearly items. Have number and text descriptions to avoid future changes that may break existing invoices.
2017-05-06 10:49:37 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
05fe0d7fcd
Fix doxygen
2017-04-29 01:01:12 +02:00
mikee2
e6b20840a3
Update Segment.php
2017-04-14 11:49:30 +02:00
mikee2
f460d2e705
Update Segment.php
2017-04-09 21:39:15 +02:00
Laurent Destailleur
00749b2a65
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/imports/import.php
htdocs/includes/odtphp/odf.php
htdocs/product/stock/product.php
htdocs/projet/list.php
2016-06-22 20:22:22 +02:00
Laurent Destailleur
a68b704daf
FIX Must not return error when vars does not exists
2016-03-25 15:57:36 +01:00
Laurent Destailleur
80e10158a5
Add code comment
2016-03-25 15:57:29 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2b3b24ca9
FIX Must not return error when vars does not exists
2016-03-22 22:01:07 +01:00
Laurent Destailleur
dd26ede0ef
Add code comment
2016-03-22 19:24:48 +01:00
Laurent Destailleur
7926fd8083
NEW ODT generators can set meta properties of ODT file
2015-09-05 00:47:06 +02:00
Laurent Destailleur
ac27884b88
Fix: [ bug #1366 ] Special characters are HTML encoded with WYSIWYG
...
module.
2014-05-07 19:13:02 +02:00
Stephen L
6e1e41e8b5
update: Sync odtphp lib (fix a lot of bugs and add a few functionalities)
...
Ref: b4e02a1306lrq3000@gmail.com >
2013-04-07 17:27:35 +02:00
Laurent Destailleur
6ff9444903
Fix: temporary folder when creating ODT segments on Windows or system…
2012-12-29 01:25:56 +01:00
Regis Houssin
03711cf6f2
Fix: remove obsolete tags
2011-08-27 19:15:14 +00:00
Laurent Destailleur
09b6b7a6f0
New: Add OdtPHP to generate documents from odt models.
2010-02-15 22:39:13 +00:00
