Commit Graph

42500 Commits

Author SHA1 Message Date
KreizIT
ca97c0bef3 Refactor: RESOURCE_* trigger 2014-07-11 16:06:06 +02:00
KreizIT
5e7c0639b0 Refactor: various trigger 2014-07-11 16:02:27 +02:00
KreizIT
5093fecc60 Refactor: SUPPLIER_PRODUCT_BUYPRICE_ * trigger 2014-07-11 15:50:40 +02:00
KreizIT
42ef7149fd Refactor: BILL_SUPPLIER_* and LINEBILL_SUPPLIER_* trigger 2014-07-11 15:48:25 +02:00
KreizIT
bbdaa59921 Refactor: ORDER_SUPPLIER_* and LINEORDER_SUPPLIER_* trigger 2014-07-11 15:32:23 +02:00
KreizIT
b8499a80ec Refactor: LINK_* trigger 2014-07-11 15:08:01 +02:00
KreizIT
971ae8ae59 Refactor: TVA_* trigger 2014-07-11 15:01:51 +02:00
KreizIT
a7afb5bdae Refactor: PAIEMENT_SALARY_* trigger 2014-07-11 14:54:32 +02:00
KreizIT
c1a004106d Refactor: LOCALTAXE_* trigger 2014-07-11 14:47:44 +02:00
KreizIT
fc61cc9bfa Refactor: BILL_* and LINEBILL_* trigger 2014-07-11 14:36:13 +02:00
KreizIT
8e64ea274d Refactor: ORDER_* and LINEORDER_* trigger 2014-07-11 14:02:21 +02:00
Laurent Destailleur
5e75dd27e8 Merge pull request #1719 from frederic34/selectbank
Select bank account for propal order and invoice
2014-07-11 12:29:21 +02:00
Laurent Destailleur
5c81074483 Merge pull request #1709 from KreizIT/review_trig2
Review trig2
2014-07-11 12:27:43 +02:00
Laurent Destailleur
a8dbcf4d36 Merge pull request #1728 from fmarcet/develop
New: Can have half day holiday
2014-07-11 12:22:37 +02:00
Laurent Destailleur
9b35e0985f Merge pull request #1729 from GPCsolutions/gig
Support gigaoctets of session memory
2014-07-11 12:20:08 +02:00
juanjo
fb3392a7b2 Trad: Update from Transifex 2014-07-10 19:49:20 +02:00
Raphaël Doursenaud
d476ca4a68 Support gigaoctets of session memory 2014-07-10 15:01:37 +02:00
fmarcet
ab57c236be New: Can have half day holiday
New: Add Spanish holidays
Fix: Holiday log shows nothing
2014-07-10 12:06:09 +02:00
frederic34
742bdcb715 Set bank account for supplier invoices 2014-07-09 18:44:20 +02:00
frederic34
387d36e4b0 Ste bank account for supplier order 2014-07-09 18:00:21 +02:00
frederic34
8c7b8bba52 Merge remote branch 'upstream/develop' into selectbank 2014-07-09 10:07:49 +02:00
Laurent Destailleur
e659b9e693 Merge remote-tracking branch 'origin/3.6' into develop 2014-07-09 00:30:23 +02:00
Laurent Destailleur
682d765de9 New: Add country iso code on 3 chars into table of countries. 2014-07-09 00:16:28 +02:00
Laurent Destailleur
32c15132df Fix: sql syntax error 2014-07-08 23:19:46 +02:00
frederic34
c8e6387e52 Merge remote branch 'upstream/develop' into selectbank
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-08 22:46:38 +02:00
Laurent Destailleur
8bad4a3c1d Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
	htdocs/install/mysql/tables/llx_product_batch.key.sql
2014-07-08 22:45:31 +02:00
Laurent Destailleur
f0056b3b95 Fix: Migration does not match tables 2014-07-08 22:40:06 +02:00
Laurent Destailleur
e624049161 Fix: Pb with migration with pgsql 2014-07-08 22:12:20 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden.
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
2014-07-08 21:50:29 +02:00
frederic34
beb471980e Add fields for supplier order and invoice 2014-07-08 21:50:21 +02:00
Laurent Destailleur
2b83d3fda7 Fix: File for migration 3.5 to 3.6 was modified. 2014-07-08 21:44:55 +02:00
Laurent Destailleur
9b6b5feb4f Fix: ON DELETE CASCADE is forbidden. 2014-07-08 21:38:20 +02:00
Laurent Destailleur
94cd8debeb Fix: table declaration
Fix: regretion into trigger management
2014-07-08 21:24:36 +02:00
Laurent Destailleur
5d2a81a4f0 Fix: checkstyle 2014-07-08 21:17:40 +02:00
Laurent Destailleur
932206a152 Fix: phpunit 2014-07-08 21:04:17 +02:00
Laurent Destailleur
f1d1736532 Fix: checkstyle 2014-07-08 20:59:14 +02:00
Laurent Destailleur
7cbee97f6e Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	.travis.yml
2014-07-08 20:26:38 +02:00
Laurent Destailleur
0e78e631c1 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	.travis.yml
2014-07-08 20:22:51 +02:00
Laurent Destailleur
869bde5fb0 Fix: Ignore vagrant dir into CI
Conflicts:
	.travis.yml
2014-07-08 20:18:22 +02:00
Laurent Destailleur
076a842488 Fix: Ignore vagrant dir into CI 2014-07-08 20:10:56 +02:00
frederic34
865fea37e9 Correct filter 2014-07-08 16:02:46 +02:00
frederic34
a2911cef11 Filter on invoice for "treso" 2014-07-08 11:46:22 +02:00
Laurent Destailleur
0eabf26d27 Fix: Checkstyle 2014-07-08 01:15:59 +02:00
Laurent Destailleur
ad4babb154 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	.travis.yml
	htdocs/fichinter/fiche.php
2014-07-08 01:12:55 +02:00
Laurent Destailleur
36e6f9a9fc Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	.travis.yml
2014-07-08 01:06:17 +02:00
Laurent Destailleur
aaa2d75dc3 Disable test on Zend.Files.ClosingTag for the moment to try to restore a
green status with travis.
2014-07-08 01:04:16 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Laurent Destailleur
6c8c232036 Fix: Solve timeout pb. 2014-07-08 00:53:15 +02:00
Laurent Destailleur
5b1cdd05cb Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-08 00:50:32 +02:00
Laurent Destailleur
e8b7d36004 Fix: Solve timeout pb. 2014-07-08 00:50:05 +02:00