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
BackrndSource
df388df3ff
Update html.form.class.php
...
$lang->load('errors') is needed to load the traductions for:
$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
2017-10-16 22:56:16 +02:00
Maxime Kohlhaas
25fa7d0564
New : add salaries, expense reports and leave requests in HRM tab of user card
2017-10-16 21:42:57 +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
Maxime Kohlhaas
f7cadfbed1
Fix function declaration
2017-10-16 21:42:24 +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
Maxime Kohlhaas
b3f17dc614
Better with leftmenu
2017-10-16 20:20:55 +02:00
Maxime Kohlhaas
dac99c7745
Missing menus in links on index stats
2017-10-16 20:16:30 +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
fappels
907ae36cdf
Add insert, update and delete methods to line class
...
Cleanup properties
Add insert, line and delete methods
2017-10-15 17:58:22 +02:00
fappels
51264d4683
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop
2017-10-15 17:28:00 +02: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
Laurent Destailleur
56e27d785a
CSS on report
2017-10-14 01:03:59 +02:00
Laurent Destailleur
b90770c30c
NEW Can rename (so reorder) bank receipts
2017-10-13 23:38:57 +02:00
Laurent Destailleur
d06f260b94
Fix amount format
2017-10-13 23:13:26 +02:00
Laurent Destailleur
07d16afe3b
Save one space
2017-10-13 23:10:40 +02:00
Laurent Destailleur
c014786446
NEW On reconciliation, show balance including all reconciliated fields
2017-10-13 23:07:27 +02:00
