lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
62,509 Commits 43 Branches 150 Tags 886 MiB
99239cbb38
Commit Graph

62509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
99239cbb38 Add API close to close an order 2017-10-18 15:34:03 +02:00
Laurent Destailleur
8e4cb2ea79 Update doc/test 2017-10-18 12:09:11 +02:00
Laurent Destailleur
66538c7c0f Position of method 2017-10-18 11:34:49 +02:00
Laurent Destailleur
69b131b919 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/api_thirdparties.class.php
 2017-10-18 11:28:20 +02:00
Laurent Destailleur
07a6f75b95 Update changelog 2017-10-18 11:25:41 +02:00
Laurent Destailleur
037b90f2f3 NEW The comment when closing a proposal is added to commercial proposal 2017-10-18 11:23:16 +02:00
Laurent Destailleur
b124c7f16d Clean params 2017-10-18 11:15:54 +02:00
Laurent Destailleur
000c1bddb2 Fix we lose the private not when closing proposal 2017-10-18 11:12:59 +02:00
Laurent Destailleur
d40dda83cf Add API "close" for proposals 
Standardize code
 2017-10-18 11:10:08 +02:00
Laurent Destailleur
347883b7be Code comment 2017-10-18 10:39:36 +02:00
Laurent Destailleur
536e1a95c7 Add SEPA file example 2017-10-17 14:20:39 +02:00
Laurent Destailleur
6bcdf2ff75 Test replacement of img switcher with FA css 2017-10-17 14:03:22 +02:00
Laurent Destailleur
3a97a3e2ad Move key "Translation" into main file. 
Add direct link to edit on transifex
 2017-10-17 13:05:55 +02:00
Laurent Destailleur
aa1ff189e1 Fix var not correctly initialized when using api + multicompany 2017-10-17 12:58:26 +02:00
Laurent Destailleur
235817c581 Fix missing default limit 2017-10-17 12:02:58 +02:00
Laurent Destailleur
5b880cf45f Merge pull request #7645 from frederic34/transedit 
enhance admin translation
 2017-10-17 11:48:19 +02:00
Laurent Destailleur
d70c215ab8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries.php
	htdocs/fourn/facture/card.php
 2017-10-17 11:14:58 +02:00
Laurent Destailleur
81e7f45200 FIX Stats on invoices show nothing 2017-10-17 11:08:49 +02:00
Laurent Destailleur
5998f60764 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-17 10:51:21 +02:00
Laurent Destailleur
5937fba373 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-17 10:51:11 +02:00
Laurent Destailleur
8b140ab069 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-17 10:44:29 +02:00
Laurent Destailleur
eb1fdca157 NEW Can create intervention from a proposal 2017-10-17 10:44:18 +02:00
Laurent Destailleur
082d59439f Fix add missing seconds when adding event so sort order on date is ok 2017-10-17 10:43:37 +02:00
Laurent Destailleur
768c623a89 Merge pull request #7644 from atm-florian/dev_extrafield_default_value 
FIX : Extrafield default value admin/defaultvalues.php enabled
 2017-10-16 21:42:50 +02:00
Laurent Destailleur
8b78b12926 Merge pull request #7642 from BackrndSource/patch-1 
Fix #7641 Fix update of note_public and note_private on societe class
 2017-10-16 21:39:24 +02:00
Frédéric FRANCE
23e2c95af6 enhance admin translation 2017-10-16 21:22:13 +02:00
florian HENRY
51ce8bf2a5 js 2017-10-16 21:08:09 +02:00
florian HENRY
17db813a4e Logical variable name suffix/prefix 2017-10-16 21:05:12 +02:00
Laurent Destailleur
b7c1b6b9d0 Merge pull request #7638 from hregis/develop_member 
New usage of attributes
 2017-10-16 21:03:30 +02:00
florian HENRY
695740142a FIX : Extrafield default value admin/defaultvalues.php enabled 2017-10-16 20:54:53 +02:00
Laurent Destailleur
75ed44c704 Merge pull request #7636 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2017-10-16 20:54:24 +02:00
Laurent Destailleur
ebe0664aff Merge branch 'develop' into scrutinizer-patch-3 2017-10-16 20:54:15 +02:00
Laurent Destailleur
3b1b83a046 Look and feel v6 2017-10-16 20:53:23 +02:00
Laurent Destailleur
0b83513fe0 Merge pull request #7635 from papoteur-mga/develop 
Add Autofill button for amount to pay in charge payment page
 2017-10-16 20:26:53 +02: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
626fea3f7a Merge pull request #7608 from atm-john/fix_supplier_invoice_from_supp_order 
Fix extrafields transmition from supplier order to supplier invoice
 2017-10-16 20:22:26 +02:00
Laurent Destailleur
45ac8367bd NEW Add API for contracts 2017-10-16 17:56:59 +02:00
BackrndSource
fdcab4c6e1 Update societe.class.php 
fix error for function update()
Now it updates the note_public and note_private.
 2017-10-16 17:16:44 +02:00
Laurent Destailleur
a4b4eab2ae Fix API when using an API key for a user in another entity 2017-10-16 16:23:50 +02:00
Laurent Destailleur
bec985a551 Fix error message 2017-10-16 14:56:56 +02:00
Laurent Destailleur
f7fe011e98 Add CRLF before 'boundary' word. Use \r\n on wordwrap. 2017-10-16 14:31:28 +02:00
Regis Houssin
46d9ef01c6 Fix: use new usage 2017-10-16 11:18:52 +02:00
Laurent Destailleur
82348cc1e9 NEW Can filter on date on the page showing existing bindings 2017-10-16 10:17:57 +02:00
Laurent Destailleur
87814af7b6 Move function colorIsLight into functions.lib.php 
Fix scrutinizer bugs.
 2017-10-16 09:29:10 +02:00
Laurent Destailleur
afdc176f47 Fix scrutinizer 2017-10-16 08:52:00 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Papoteur
75835dd7fd Add Autofill button for amount to pay in charge payment page 2017-10-15 13:33:48 +02:00
BENKE Charlene
c44207f7d3 template file not only odt/ods 2017-10-14 12:39:39 +02:00
Laurent Destailleur
f853dbc152 Add spec for SEPA 2017-10-14 02:55:07 +02:00
Laurent Destailleur
b491d22c16 FIX selection of thirdparty was lost on stats page of invoices 2017-10-14 02:30:33 +02:00