Laurent Destailleur
e51aa68284
Fix link to warehouses for events
2018-05-24 12:16:04 +02:00
Laurent Destailleur
aafab12f4b
Debug API for ticket module
2018-04-29 18:06:31 +02:00
Laurent Destailleur
a3a416aa7a
Can remove comment added due to lack of test
2018-03-20 16:46:09 +01:00
Laurent Destailleur
ce7da41bef
Fix save setup
2018-03-15 23:47:16 +01:00
Laurent Destailleur
6a70d268e0
Fix SQLi reported by op7ica
2018-03-15 01:22:32 +01:00
Regis Houssin
a0774d523d
Fix: avoid conflict between invoice and invoicenumber sharings
2018-03-07 15:24:23 +01:00
Laurent Destailleur
5455ab3280
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/projet/card.php
2018-02-04 23:17:09 +01:00
Laurent Destailleur
fd8f89c708
FIX a discount is a percent, not an amount, so we use vatrate not price
2018-02-04 11:13:47 +01:00
Laurent Destailleur
c6fba7273d
Api interventions
2018-02-03 20:58:26 +01:00
Laurent Destailleur
0d90ab0c6c
Fix when counter is corrupted in database
2018-01-30 14:42:13 +01:00
Laurent Destailleur
dcd579242f
Fix <br /> (xml) into <br> (html)
2018-01-17 13:26:57 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
06e63615e3
complete api detection
2017-12-12 13:05:22 +01:00
Laurent Destailleur
2cb190fc5c
Fix return code
2017-11-17 15:27:59 +01:00
Laurent Destailleur
ea5dd3eb3d
NEW Add REST API for supplier proposals
2017-11-06 11:06:31 +01:00
Laurent Destailleur
534c50f46e
Move api that are admin features into a dedicated /admin api
2017-11-06 09:55:31 +01:00
Laurent Destailleur
7139cbb490
Fix regression
2017-11-05 19:00:43 +01:00
Laurent Destailleur
202d36d582
Work on modulebuilder
2017-11-05 18:15:59 +01:00
Laurent Destailleur
41464bf5ac
Merge pull request #7633 from defrance/patch-101
...
template file not only odt/ods
2017-10-16 20:25:20 +02:00
Laurent Destailleur
87814af7b6
Move function colorIsLight into functions.lib.php
...
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
BENKE Charlene
c44207f7d3
template file not only odt/ods
2017-10-14 12:39:39 +02:00
Laurent Destailleur
436ec93084
FIX is_erasable report bad value when thirdparty was not loaded
2017-10-04 03:22:41 +02:00
Laurent Destailleur
a6cf934973
Add log
2017-10-04 02:46:01 +02:00
Laurent Destailleur
2f80618545
Merge pull request #7390 from atm-arnaud/FIX_task_comment_design
...
Fix task comment design
2017-09-14 12:21:58 +02:00
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
c44a5ede43
FIX Several problem with the last event box on project/tasks
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7
FIX Several problem with the last event box on project/tasks
2017-09-13 15:12:54 +02:00
arnaud
4b6553d360
FIX comment color and create colorIsLight function
2017-09-13 10:43:44 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Laurent Destailleur
8f34de1036
NEW Can include tag {uuu} into some numbering masks to replace with user
2017-08-29 19:44:35 +02:00
Laurent Destailleur
60493d0a47
Several fixes (permission, missing method or class) in REST APIs
2017-07-28 11:03:30 +02:00
Laurent Destailleur
eff4282cc2
Clean files
2017-07-07 22:19:01 +02:00
Laurent Destailleur
63dcdc3a03
Fix API was loading definition of all APIs at each call.
2017-06-25 17:09:08 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Laurent Destailleur
a49174313f
Replace {extra_ with {user_extra_
2017-05-31 19:45:54 +02:00
Quentin Vial-Gouteyron
f563746310
NEW_extrafield_in_project_mask
2017-05-29 15:38:40 +02:00
Laurent Destailleur
965e23b711
Test to fix a regression
2017-05-21 19:45:47 +02:00
Laurent Destailleur
2dd2ab1003
Look and feel v6
2017-05-20 20:59:54 +02:00
BENKE Charlie
8e68aa86ac
problems with additionnal template type
...
If i active my new xml templater, and keep odt, the odt folder is added on folder to scan on my xml path
ex :
odt folder defined : c:\toto
xml folder defined : c:\tata
folder scanned with odt : c:\toto
folder scanned with odt : c:\toto,c:\tata
2017-05-14 15:17:40 +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
8009370f04
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/contact/document.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/repair.sql
2017-05-04 10:01:11 +02:00
Laurent Destailleur
50d65e3a9f
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2017-04-29 17:40:47 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Christian Seiler
e23a44bcdf
Added missing Slashes
...
fixed line where two slashes were missing, that caused an error when creating barcodes.
2017-04-16 11:09:18 +02:00
Juanjo Menent
006ad4cef8
FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View
2017-04-15 20:04:45 +02:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Ion
9270b2c54c
Add supplier order/invoice to elementproperties
2017-01-20 10:57:41 +01:00
Laurent Destailleur
0fe844aa00
FIX usage of tag {y} in numbering modules
2017-01-16 00:01:06 +01:00
