2
0
forked from Wavyzz/dolibarr
Commit Graph

469 Commits

Author SHA1 Message Date
Maxime Kohlhaas
b22b604d02 Accountancy code on user object in prevision of the complete accountancy module 2013-06-25 11:14:00 +02:00
Maxime Kohlhaas
109d1a71cb Merge 2013-06-25 11:00:48 +02:00
Regis Houssin
930f6e4850 Fix: avoid error with crlf 2013-06-24 18:04:06 +02:00
Laurent Destailleur
7778a17a89 Qual: clean code from deprecated vars 2013-06-24 16:41:31 +02:00
Florian Henry
4f43ec0acf Add extrafield tables 2013-06-10 14:13:44 +02:00
Laurent Destailleur
4654e811b2 Close taks [ task #645 ]. We keep fields, just add comment into tables
with explanation of fields.
2013-06-06 18:54:17 +02:00
Laurent Destailleur
b61ca887d5 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/cache.manifest
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-05-27 12:57:57 +02:00
Florian Henry
557756058f Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41
2013-05-25 20:58:02 +02:00
Florian Henry
c61f7b6390 Fix [ bug #911 ] Reorder intervention do not work 2013-05-25 19:48:49 +02:00
Regis Houssin
309f59fb00 Fix: wrong field name 2013-05-25 19:03:16 +02:00
Regis Houssin
b9695ddc2b Fix: wrong field name 2013-05-25 19:02:06 +02:00
Laurent Destailleur
8fa9a60bc6 Fix: Bad field size 2013-05-25 18:12:07 +02:00
Laurent Destailleur
1bab0f9f58 Fix: Bad field size 2013-05-25 18:10:55 +02:00
fhenry
cbf29e20a2 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 13:00:36 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
fhenry
760ae88f39 [ task #531 ] Add a duration on tasks 2013-05-13 17:08:36 +02:00
fhenry
b3f40b900b Make constraint SQL unique name (Mandatory for PgSQL) 2013-05-07 09:26:31 +02:00
fhenry
9038549d0d fix margin calculation problem 2013-05-03 11:50:13 +02:00
fhenry
8d6f959d31 Fix [ bug #864 ] fournisseur_extrafields 2013-05-01 22:57:03 +02:00
fhenry
1fc04d5b5c Add table extrafield for commande fournisseur...
Seems this module work as separate from order but config is missing. Try
to create a new one.
2013-04-30 13:56:03 +02:00
Laurent Destailleur
203d4e3ca8 Prepare database for parameters into boxes 2013-04-23 14:17:04 +02:00
Laurent Destailleur
bb3f40a1bf Qual: Clean code to be able to update combo box when removing a box.
Qual: Opensurvey tables
2013-04-19 15:26:53 +02:00
Laurent Destailleur
570e4391a5 Fix: Box with product out of stocks for pgsql 2013-04-19 14:51:39 +02:00
Regis Houssin
b6bcffa4d9 Fix: missing field 2013-04-18 09:44:33 +02:00
fhenry
8f8dce19cc Task Project Extrafield : Forget to add to index tables 2013-04-15 12:38:27 +02:00
Laurent Destailleur
d6d8f91dda Fix: Rename of field not complete 2013-04-12 00:19:18 +02:00
Laurent Destailleur
891dbf5c60 Fix: Not complete renaming 2013-04-11 21:53:41 +02:00
Laurent Destailleur
750b30863f Qual: Clean code from things that should be inside external module. 2013-04-11 09:15:41 +02:00
Laurent Destailleur
20e9eb5f8f Fix: syntax error 2013-04-10 10:40:59 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
fhenry
8efeb93812 Merge branch 'develop' into develop_orderextrafield 2013-04-08 09:45:43 +02:00
fhenry
a27b3a2119 Fix PostGreSQL blocking install : wrong SQL syntax 2013-04-08 09:45:11 +02:00
fhenry
78571e4458 Merge branch 'develop' into develop_orderextrafield 2013-04-07 15:12:27 +02:00
fhenry
0427080a4e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_orderextrafield

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e
2013-04-07 15:11:52 +02:00
fhenry
144ab24545 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd
2013-04-07 15:08:47 +02:00
Laurent Destailleur
88858136fc New: Enhance agenda module to reach RFC2445 (add busy information). 2013-04-06 17:39:31 +02:00
fhenry
cc465380da Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry) 2013-04-06 12:20:19 +02:00
fhenry
b7137606ee Merge branch 'develop' into develop_orderextrafield
Conflicts:
	htdocs/commande/fiche.php
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d
2013-04-06 10:41:29 +02:00
Laurent Destailleur
adf47d6975 Qual: Uniformise columns 2013-04-06 00:34:33 +02:00
Laurent Destailleur
a3c5db968e Merge pull request #800 from FHenry/develop
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-05 13:39:52 -07:00
Laurent Destailleur
7ebd24daea Merge pull request #805 from zedzedtop/develop
Develop
2013-04-05 13:28:58 -07:00
Laurent Destailleur
71716dcab5 Ref: sql file not up to date 2013-04-05 13:33:48 +02:00
fhenry
dfcb38d13f [ task #793 ] Add extrafield feature into Orders module 2013-04-05 12:43:00 +02:00
fhenry
dcd960a957 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
2013-04-05 11:46:09 +02:00
Laurent Destailleur
58bb2df24c Qual: Uniformize columns 2013-04-04 20:58:42 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Regis Houssin
d474955d56 Fix: missing renaming field !! 2013-04-03 18:54:44 +02:00
fhenry
ae00d8b214 Add import_key into llx_product_price 2013-04-02 15:03:01 +02:00
Laurent Destailleur
cc69cf7b76 New: Can defined a clicktodial setup per user 2013-03-31 16:44:24 +02:00
fhenry
e745cbb5cf Add missing column into llx_extrafield creation 2013-03-28 22:13:04 +01:00