Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,243 Commits 36 Branches 190 Tags
4da8fb901b0d28385fb5f94dd52f412b8c1e15fe
Commit Graph

135 Commits

Author SHA1 Message Date
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Raphaël Doursenaud
4ad5413163 Sync db upgrade with db install to avoid silly upgrade errors 2013-11-12 15:36:51 +01:00
Laurent Destailleur
b6a083596a Merge remote-tracking branch 'origin/3.4' into develop 2013-09-24 20:21:32 +02:00
Laurent Destailleur
a3e74afb02 Fix: varchar 256 2013-09-24 20:14:42 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
a1a8fac25c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-03 11:15:15 +02:00
Laurent Destailleur
520101bdfb Fix: Missing vat rate 2013-06-01 02:52:25 +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
30fb1e5e05 Fix bug [ bug #885 ] silent pgsql errors with click2dial 2013-05-09 10:26:04 +02:00
fhenry
c623e7913b Update migration script with new idx index unique name opensurvey 2013-05-07 14:31:11 +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
9bbe5014e6 Fix: Bad field size on old installations 2013-04-28 23:50:40 +02:00
fhenry
b4f3e9d5a8 fix table name in migration script 2013-04-26 10:34:11 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
203d4e3ca8 Prepare database for parameters into boxes 2013-04-23 14:17:04 +02:00
Laurent Destailleur
08ae1d289b Pgsql compatibility 2013-04-19 15:02:53 +02:00
Regis Houssin
b6bcffa4d9 Fix: missing field 2013-04-18 09:44:33 +02:00
Regis Houssin
2538a9e20e Fix: duplicate sql request 2013-04-18 09:39:43 +02:00
Laurent Destailleur
b30c492494 Fix: pgsql upgrade 2013-04-16 16:29:21 +02:00
Laurent Destailleur
2db3bcc72e Fix: migration 3.3.0 to 3.4.0 2013-04-15 10:00:09 +02:00
Laurent Destailleur
eead2977d9 Fix: pgsql upgrade 2013-04-14 23:15:55 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
Laurent Destailleur
d6d8f91dda Fix: Rename of field not complete 2013-04-12 00:19:18 +02:00
Laurent Destailleur
fe20f8ae1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
	htdocs/install/mysql/tables/llx_expedition.key.sql
	htdocs/install/mysql/tables/llx_expedition.sql
 2013-04-11 23:08:10 +02:00
Laurent Destailleur
891dbf5c60 Fix: Not complete renaming 2013-04-11 21:53:41 +02:00
Regis Houssin
c74fb3e3e9 Fix: remove constraint and index before rename field !! 2013-04-11 21:29:38 +02:00
Laurent Destailleur
9a29014716 New: Add color field into user table 2013-04-11 09:44:09 +02:00
Regis Houssin
b152e58793 Fix: change for experimental encyption 2013-04-10 15:42:21 +02:00
Laurent Destailleur
20e9eb5f8f Fix: syntax error 2013-04-10 10:40:59 +02:00
Laurent Destailleur
af6f075b5c Qual: Better error management. 
Qual: Uniformize code for canvas
 2013-04-09 23:56:52 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
fhenry
52706117d9 Merge branch 'develop' into develop_orderextrafield 2013-04-07 23:54:33 +02:00
fhenry
393007625a 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: I9df271d1629014299e7db131a66c1322aa897f6d
 2013-04-07 23:52:02 +02:00
simnandez
44bfc1db4a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-04-07 15:53:31 +02:00
simnandez
9e8c3a1b1e Updates 2013-04-07 15:45:48 +02:00
Laurent Destailleur
59dfab9d21 Fix: regresson after rename of fields 2013-04-07 15:43:21 +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
simnandez
7b70fc4bf3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-04-07 14:30:44 +02:00
Laurent Destailleur
88858136fc New: Enhance agenda module to reach RFC2445 (add busy information). 2013-04-06 17:39:31 +02:00
Laurent Destailleur
d863a0b1bd Fix: syntax error 2013-04-06 16:21:34 +02:00