Commit Graph

45795 Commits

Author SHA1 Message Date
Laurent Destailleur
2f5c94fb4a Merge pull request #2357 from KreizIT/fix_mssql
Fix mssql
2015-02-18 23:32:48 +01:00
Laurent Destailleur
a05e39f119 Merge pull request #2356 from KreizIT/fix_sqldata
Fix inconsistent data
2015-02-18 23:31:22 +01:00
Laurent Destailleur
29b68e6c05 Merge branch 'defrance69-patch-47' into develop 2015-02-18 23:24:15 +01:00
Laurent Destailleur
9afe52458b Merge branch 'patch-47' of https://github.com/defrance69/dolibarr into defrance69-patch-47 2015-02-18 23:23:44 +01:00
Laurent Destailleur
ad1c2ed06f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-18 22:52:50 +01:00
Laurent Destailleur
c2f5b24a9d Better text 2015-02-18 22:40:13 +01:00
Laurent Destailleur
863094637e Merge pull request #2333 from FHenry/develop_review_productstat
review product stats list and add filter by period
2015-02-18 22:23:33 +01:00
Laurent Destailleur
1c0f22b905 Merge pull request #2368 from frederic34/php-iban
New: Add php-iban lib 1.4.6 to check iban information.
2015-02-18 22:11:31 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
2015-02-18 22:04:26 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Laurent Destailleur
fe50a585fc Fix: removed deprecated menu 2015-02-18 18:47:01 +01:00
frederic34
cbe49df090 Add copyright 2015-02-18 16:07:59 +01:00
frederic34
4bbbff8d69 Add BIC/SWIFT Validation 2015-02-17 22:04:16 +01:00
Laurent Destailleur
1e1543403b New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set
user approving as contact following supplier order.
2015-02-17 19:49:17 +01:00
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +01:00
frederic34
f652cf4e97 Add translation for IBAN Valid or not 2015-02-17 17:02:38 +01:00
Laurent Destailleur
685b8d722d Fix: Bad hook name 2015-02-17 16:46:37 +01:00
frederic34
376eadd22c Merge remote branch 'upstream/develop' into php-iban 2015-02-17 11:43:23 +01:00
frederic34
07197f3ca0 Add libs 2015-02-17 11:41:50 +01:00
frederic34
9d0ffb7e85 Add php-iban and check IBAN 2015-02-17 10:23:31 +01:00
Laurent Destailleur
bc88917b81 phpcs 2015-02-17 10:18:01 +01:00
Laurent Destailleur
a64cd69639 phpcs 2015-02-17 09:56:19 +01:00
Laurent Destailleur
23562a01ab Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
2015-02-16 20:59:04 +01:00
Laurent Destailleur
5688e8ecd8 Add todo to show code is missing here 2015-02-16 20:51:05 +01:00
Laurent Destailleur
1e78d0e8d4 New: Introduce hidden option
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
2015-02-16 20:46:54 +01:00
Laurent Destailleur
aa380f6ee0 fix bad include 2015-02-16 20:43:39 +01:00
Laurent Destailleur
213c818204 Debug serial/lot management 2015-02-16 20:14:16 +01:00
Laurent Destailleur
9a9a1f3983 Fix bad id 2015-02-16 19:14:34 +01:00
Laurent Destailleur
03d19bf77f Fix: Sort criteria 2015-02-16 18:02:25 +01:00
Laurent Destailleur
118ae7e8f8 Backport fix done into dev. 2015-02-16 17:55:53 +01:00
Laurent Destailleur
58fc57744a Update example 2015-02-16 17:25:26 +01:00
Laurent Destailleur
3ca31e34cb New: Add field "budget" (amount) on projects. 2015-02-16 10:58:05 +01:00
Laurent Destailleur
82b3f4a102 Add field budget_amount on project. 2015-02-16 10:40:09 +01:00
Laurent Destailleur
3cf4b80baa Fix missing test of action when using canvas 2015-02-16 02:02:11 +01:00
Laurent Destailleur
2045fb22e9 Lock 5.5.40 2015-02-15 23:39:30 +01:00
Laurent Destailleur
9ab48b3d90 Revert "Trad"
This reverts commit bb2c33e2c1.
2015-02-15 22:51:18 +01:00
Laurent Destailleur
bb2c33e2c1 Trad 2015-02-15 22:49:53 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
2015-02-15 19:51:49 +01:00
Laurent Destailleur
2a266b3a7e Clean code 2015-02-15 19:47:55 +01:00
Laurent Destailleur
eef1e17c61 Fix: default vat 2015-02-15 19:38:20 +01:00
Laurent Destailleur
b00de9707a Work on expensereport module 2015-02-15 19:13:16 +01:00
Laurent Destailleur
09ef15ea24 phpcs 2015-02-15 13:42:21 +01:00
Laurent Destailleur
bedaa483ad br useless 2015-02-14 20:40:10 +01:00
Laurent Destailleur
3b09dc53cd Fix regression on total visible on invoice since situation invoice. 2015-02-14 20:32:11 +01:00
Laurent Destailleur
4e6d5e1cd1 New: Add filter fields on the subscription list 2015-02-14 19:10:40 +01:00
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr
standard to replace current one.
2015-02-14 18:39:45 +01:00
KreizIT
7d51ae6789 Fix typo 2015-02-14 16:33:05 +01:00
KreizIT
0c0c442248 Make MS SQL working 2015-02-14 16:27:00 +01:00
KreizIT
674585136e Fix inconsistent data 2015-02-14 16:18:18 +01:00