Commit Graph

63779 Commits

Author SHA1 Message Date
Laurent Destailleur
d1cfbc2906 Code comment 2017-12-22 01:03:40 +01:00
Laurent Destailleur
207730bf63 Css 2017-12-22 00:22:33 +01:00
Laurent Destailleur
27a9a81f99 Fix link to contracts 2017-12-21 23:48:33 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960 FIX security vulnerability reported by ADLab of Venustech 2017-12-21 13:32:16 +01:00
Laurent Destailleur
62f895e2ec Fix: avoid infinite loop 2017-12-21 13:31:39 +01:00
Laurent Destailleur
4a5988accb FIX security vulnerability reported by ADLab of Venustech 2017-12-21 12:52:19 +01:00
Laurent Destailleur
54d7d85d90 Sync transifex 2017-12-21 11:47:35 +01:00
Laurent Destailleur
e8a141aa63 Add uruguay languages 2017-12-21 11:37:51 +01:00
Laurent Destailleur
635917d0e6 CSS 2017-12-20 21:33:45 +01:00
Laurent Destailleur
f1305bbdd6 Fix css 2017-12-20 21:14:22 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
9ea2fe226d Fix look and feel v6 2017-12-20 19:30:30 +01:00
Laurent Destailleur
b03d0134a7 Filter on date extrafield timestamp and datetime disabled (not possible
yet)
2017-12-20 18:30:41 +01:00
Laurent Destailleur
3f6b3b51ca Fix css 2017-12-20 15:09:58 +01:00
Laurent Destailleur
9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php
2017-12-20 13:28:41 +01:00
Laurent Destailleur
6900771c70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-20 13:17:39 +01:00
Laurent Destailleur
ca8ae3c723 Fix option MAIN_USE_JQUERY_JEDITABLE 2017-12-20 13:17:21 +01:00
Laurent Destailleur
b1f98b5903 Fix inline edit 2017-12-20 12:45:38 +01:00
Laurent Destailleur
846453e94b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-19 18:26:49 +01:00
Laurent Destailleur
12d91d7444 Fix missing messages in error report.
Fix test on non empty array
2017-12-19 18:26:27 +01:00
Laurent Destailleur
d51ae72eb4
Merge pull request #7965 from Oeris/develop-api
NEW improvements of invoices, orders and proposals in the REST API
2017-12-19 18:17:48 +01:00
Laurent Destailleur
57603e3df4
Update api_invoices.class.php 2017-12-19 18:16:39 +01:00
Laurent Destailleur
bffed79132
Update api_invoices.class.php 2017-12-19 18:06:05 +01:00
Laurent Destailleur
3635e88396
Update api_proposals.class.php 2017-12-19 18:01:38 +01:00
Laurent Destailleur
29b9fb6f54
Merge pull request #7964 from aspangaro/8.0-a1
NEW : Add search on date and accounting account in various payment list
2017-12-19 17:58:26 +01:00
Laurent Destailleur
016be9139b Fix sql request 2017-12-19 17:09:47 +01:00
Laurent Destailleur
731cb3f721 Fix editor of user signature 2017-12-19 17:00:40 +01:00
Laurent Destailleur
01c99b780e Fix missing index 2017-12-19 16:22:47 +01:00
Laurent Destailleur
f504716501 Fix sync contact - external user 2017-12-19 16:16:31 +01:00
Neil Orley
171e388f6d NEW Update bank account when updating an order
Add the ability to update the bankaccount when updating an order
2017-12-19 14:16:51 +01:00
Neil Orley
a3f4066790 NEW Update bank account when updating an invoice
Add the ability to update the bankaccount when updating an invoice
2017-12-19 14:14:26 +01:00
Neil Orley
7e3a2d75bb FIX Error when classify the order as invoiced unsing API
Remove of notrigger parameter. The notrigger attribute caused a type error when used.
2017-12-19 13:06:28 +01:00
Neil Orley
40aebfa081 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-19 12:54:38 +01:00
Laurent Destailleur
feaff433b8 Debug module website 2017-12-19 12:54:10 +01:00
Neil Orley
e90183f4ba NEW Update end of validity date of proposal using the API
Add the ability to update the end of validity date when modifying a proposal
2017-12-19 12:37:37 +01:00
Neil Orley
fe8fac9577 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-19 12:36:46 +01:00
Laurent Destailleur
89a62103ca Debug module website 2017-12-19 11:40:29 +01:00
Laurent Destailleur
fcf04c122f Fix phpcs 2017-12-19 00:39:01 +01:00
Laurent Destailleur
91932838ef Fix constant MAIN_LANG_DEFAULT not used 2017-12-19 00:24:38 +01:00
Laurent Destailleur
d4afb8300d Fix several pb of duplicate functions in some cases 2017-12-19 00:15:22 +01:00
Laurent Destailleur
2e87318b58 Fix sql error 2017-12-18 19:15:42 +01:00
Laurent Destailleur
2204790602 Fix filter on project id when id is list with comma 2017-12-18 19:04:57 +01:00
Neil Orley
0817873267 NEW Create an order using an existing proposal
Create an order using an existing proposal.
2017-12-18 16:13:54 +01:00
Laurent Destailleur
1351a43a30 FIX Maxi debug of permission for users external or restricted to sales
representatives
2017-12-18 16:13:05 +01:00
Neil Orley
d8dac909d6 NEW Add error message
Returns the error message when the API can't add a new line in a proposal
2017-12-18 14:36:41 +01:00
Neil Orley
ee6b0d7237 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-18 14:36:29 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent
FIX Revenue stamp not visible on the transfer payment page
2017-12-18 12:43:03 +01:00