lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,317 Commits 43 Branches 150 Tags 886 MiB
3.7
Commit Graph

2410 Commits

Author SHA1 Message Date
Laurent Destailleur
688d58413b Merge pull request #1710 from aspangaro/develop-accounting2 
New feature :: Add fiscal year
 2014-07-07 21:28:35 +02:00
Laurent Destailleur
1a2ed2138b New: Add new type of event (when type of events are used, not by 
default)
 2014-07-06 21:25:25 +02:00
Laurent Destailleur
ce3fa14511 New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to 
create an automatic event into agenda.
Qual: Removed hard coded rowid into data init.
 2014-07-06 19:25:15 +02:00
aspangaro
9eaeaae2fb Merge branch 'Upstream/develop' 2014-07-05 08:48:51 +02:00
aspangaro
be78e96313 Bug fix & add tab info 2014-07-05 08:47:01 +02:00
Laurent Destailleur
baea822ed5 Fix: Migration script 2014-07-04 18:24:48 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00
Laurent Destailleur
f9ee4b3c9d Merge branch 'db-relations' of github.com:marcosgdf/dolibarr into 
marcosgdf-db-relations

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-04 14:06:07 +02:00
Laurent Destailleur
62832167a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-04 13:45:07 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Laurent Destailleur
9fa44e6221 Merge pull request #1706 from frederic34/patch-2 
Update 3.6.0-3.7.0.sql
 2014-07-04 13:21:57 +02:00
Juanjo Menent
72243d4f38 fix: Timestamp with default null 2014-07-04 12:32:57 +02:00
Juanjo Menent
9fa3d8ddd1 Allow migration 3.6x to 3.7.0 2014-07-04 12:27:53 +02:00
aspangaro
a2ac578712 Merge branch 'Upstream/develop' 2014-07-04 06:21:00 +02:00
FRANCE Frédéric
8fc2d5ebb8 Update 3.6.0-3.7.0.sql 
llx_c_product doesn't exist
 2014-07-03 20:38:33 +02:00
Juanjo Menent
e30649dcd2 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with company 2014-07-03 17:39:31 +02:00
Juanjo Menent
cb4c3a4431 [ task #1063 ] Allow edit localtaxes rate for thirds. Works 
withd database
 2014-07-03 15:51:46 +02:00
Laurent Destailleur
a1b6aedc90 Add field task_datehour 2014-07-03 12:53:26 +02:00
Marcos García de La Fuente
e351657cc0 Removed key restrictions 2014-07-03 10:16:37 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Marcos García de La Fuente
d38bebf990 Created foreign key relations for llx_product and llx_product_price table 2014-07-02 21:04:34 +02:00
Laurent Destailleur
de527365a8 Fix: [ bug #1517 ] Packages sizes 2014-07-02 20:10:44 +02:00
Laurent Destailleur
b985dc3342 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/install/mysql/tables/llx_bank_account.sql
 2014-06-30 00:42:17 +02:00
Laurent Destailleur
6cf8c3d08c Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-06-29 23:57:57 +02:00
Laurent Destailleur
e2472351c3 Merge branch 'fix1487' of github.com:KreizIT/dolibarr into 
KreizIT-fix1487

Conflicts:
	ChangeLog
 2014-06-29 23:42:38 +02:00
aspangaro
5cc8ec4f5f Add accountancy code journal into bank card & modify presentation 2014-06-29 20:10:43 +02:00
aspangaro
53bd5022e0 Align size for accounting account & Drop old table & Typo 2014-06-29 07:57:42 +02:00
aspangaro
25f2fec473 Fix :: acount_parent must be an int - Final step 2014-06-29 07:02:13 +02:00
aspangaro
46320071a0 Merge branch 'Upstream/develop' 2014-06-29 05:42:37 +02:00
Laurent Destailleur
56bc99a558 Include iso code for countries 2014-06-28 21:40:10 +02:00
Laurent Destailleur
1dafb58f09 Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting3

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-06-26 22:53:25 +02:00
Laurent Destailleur
e2790895ad Prepare 3.7 development. 2014-06-26 21:48:57 +02:00
Laurent Destailleur
f336becdb3 Merge pull request #1635 from aspangaro/develop-accounting 
Chart of accounts BE PCMN-BASE - Account_parent must be an int.
 2014-06-26 21:42:22 +02:00
aspangaro
56785f1149 Merge branch 'Upstream/develop' 2014-06-24 06:10:47 +02:00
aspangaro
865d853af8 Add migration file to 3.7 & update llx_c_paiement 2014-06-24 06:02:17 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-06-17 12:01:45 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
aspangaro
67f05515d9 Add accountancy_code into llx_c_paiement 2014-06-03 06:19:24 +02:00
aspangaro
27f0cbdb83 Merge branch 'Upstream/develop' 2014-05-30 21:01:01 +02:00
Laurent Destailleur
4060dfe8f2 Code comment to remind goal of field. 2014-05-30 11:46:16 +02:00
aspangaro
aa4e9d5965 Merge branch 'Upstream/develop' 2014-05-29 21:44:03 +02:00
aspangaro
22bb789374 Chart of accounts BE PCMN-BASE - Account_parent must be an int. 2014-05-29 21:35:29 +02:00
Laurent Destailleur
882fc42ea1 Fix: 3.5 migration that was not complete. Second chance into 3.6. 2014-05-29 20:39:51 +02:00
Laurent Destailleur
b15c79845e Merge remote-tracking branch 'origin/3.5' into develop 2014-05-29 20:27:21 +02:00
Laurent Destailleur
67bd18f5cc Fix: [ bug #1406 ] Impossible de modifier une facture fournisseur 2014-05-29 20:25:41 +02:00
Laurent Destailleur
1e2c452b95 Fix: If not choice at all we show all of them. 2014-05-29 18:11:14 +02:00
Florian HENRY
a88491ecc6 reset last commit 2014-05-29 14:51:42 +02:00
Florian HENRY
0cfd4504ad add index on llx_mailing_cible 2014-05-29 14:48:07 +02:00
aspangaro
b384f91096 Merge branch 'upstream/develop' 2014-05-28 05:35:35 +02:00
aspangaro
dce9c2bc76 Fiscal year - 1st step 2014-05-28 05:34:10 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
aspangaro
22bd18486b Merge branch 'upstream/develop' 2014-05-23 02:25:41 +02:00
aspangaro
0a670092d5 Fix :: Account_parent must be an int - Step 1 2014-05-23 02:23:32 +02:00
Raphaël Doursenaud
0fd994a687 Install: english comments 2014-05-19 14:33:39 +02:00
Raphaël Doursenaud
ba8676dc61 Install: unlimitted memory is ok 2014-05-19 14:33:39 +02:00
Florian HENRY
26b74a53a2 Fix initdata 3.6 for CommandeFournisseurTest.php run correctly 2014-05-14 14:17:03 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Florian HENRY
45c96e169f fix install 2014-05-13 19:17:50 +02:00
Jean-François Ferry
7fbcb4fe7d Missing auto-increlent attribute when table c_resource_type create 2014-05-10 22:07:12 +02:00
Jean-François Ferry
5f74b86b18 Add dictionary to define type of resources 2014-05-10 22:07:12 +02:00
Jean-François Ferry
1d929d267c Move table creation instruction into migration tables 2014-05-10 22:07:12 +02:00
Jean-François Ferry
03f0851e7d Add database tables for resource module 2014-05-10 22:06:23 +02:00
Jean-François Ferry
6c75a0cb11 Add database tables for resource module 2014-05-10 22:06:22 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
503924fbbc Fix: Missing cleaning orphelins for contact categories. 2014-05-06 21:56:31 +02:00
Laurent Destailleur
959b104b78 Fix: the pdf template name for typhon as not correctly set when enabling 
module.
 2014-05-06 13:31:30 +02:00
Marcos García de La Fuente
8532f967af Missing Copyright info 2014-05-05 12:24:39 +02:00
Marcos García de La Fuente
d0e5d9fd1b Improved usability of install wizard 2014-05-05 12:08:19 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
d25778f12b Qual: Removed duplicate column "datea" into table llx_societe 
(duplicated with column tms).
 2014-05-04 16:59:13 +02:00
Laurent Destailleur
03f9f0bada Fix: Pb of records not correctly cleaned when module marge is 
uninstalled (conflict between 'margin' and 'margins').
 2014-05-03 20:21:35 +02:00
Raphaël Doursenaud
5bfb06b357 Don't close php tag in generated file 2014-05-03 18:27:00 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
4a23a8a789 Merge branch 'category_translate' of github.com:aternatik/dolibarr into 
aternatik-category_translate

Conflicts:
	ChangeLog
 2014-04-28 02:39:56 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
 2014-04-26 21:47:15 +02:00
Laurent Destailleur
4ecfa1d6e0 Clean corrupted data for categories 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
 2014-04-26 21:40:57 +02:00
Laurent Destailleur
af2cf0b66f Fix: [ bug #1354 ] Tasks disapear in same sub-task 2014-04-26 21:36:58 +02:00
Laurent Destailleur
950c59eb61 Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers. 2014-04-26 17:34:39 +02:00
Laurent Destailleur
ae23d78c74 Add field nb_holidays and salary. 2014-04-25 20:06:19 +02:00
jfefe
d256799abf Work on adding catgory translation 2014-04-25 15:17:12 +02:00
Laurent Destailleur
002e64d514 Add table for email templates. 
Removed deprecated table llx_domain.
 2014-04-23 13:10:08 +02:00
Laurent Destailleur
459e5f7472 Clean corrupted data for categories 2014-04-23 11:25:05 +02:00
Raphaël Doursenaud
e6c0321fb6 Automatic events for project tasks 2014-04-22 15:30:10 +02:00
Laurent Destailleur
55c2659952 Fix: sql syntax error 2014-04-13 02:02:26 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
d2b1b1a86c Merge branch 'actiontriggers' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers

Conflicts:
	htdocs/langs/de_DE/other.lang
 2014-04-04 23:47:36 +02:00
Laurent Destailleur
cf8ff97855 Fix: Install of odt templates for project and tasks failed. 2014-04-02 13:17:20 +02:00
Laurent Destailleur
6806a87ebb Missing tms update 2014-04-02 11:02:18 +02:00
Laurent Destailleur
f027482b51 Merge pull request #1513 from KreizIT/fixtablestruct 
Fix installation script link to Task 1074 (missing new field)
 2014-03-27 16:06:51 +01:00
Raphaël Doursenaud
0d7a76d8db 3.6 migration script: fixed invalid comments 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
ee71e42b34 Action triggers: added missing triggers to 3.6 migration script 
These are the same changes than commit 3afb3a874d9d1533947651de9db28c9207278908 but for the
migration script
 2014-03-27 12:03:19 +01:00
Raphaël Doursenaud
c9c75a1c08 Action triggers: Added copyright 
Reindented the whole block because it was out.
 2014-03-27 12:02:15 +01:00
Raphaël Doursenaud
704699f9a1 Action triggers: added missing triggers to the data dictionnary 
These triggers were programmed in
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
but were nowhere to be found in the interface because they didn't hit the database.
 2014-03-27 12:02:15 +01:00
Laurent Destailleur
4d4512fadd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-26 22:14:14 +01:00
KreizIT
5c837583c3 Fix installation script link to Task 1074 (missing new field) 2014-03-26 16:58:43 +01:00
Laurent Destailleur
c45f509984 Qual: Uniformizing payments 2014-03-26 15:41:09 +01:00
Laurent Destailleur
59042a30e1 Fix and uniformize code for payment of salaries. 2014-03-25 21:35:52 +01:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases. 
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
 2014-03-21 16:22:41 +01:00
Laurent Destailleur
7fb004903e Qual: Start to clean old code. 2014-03-21 15:02:27 +01:00
Laurent Destailleur
6764d36434 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-19 11:46:30 +01:00
Laurent Destailleur
44952e353d Fix: Bad format for fk_currency fields (even if they are not used, i fix 
them).
 2014-03-19 11:46:06 +01:00
Laurent Destailleur
dbaea6fa42 Add clean sql requests into repair.sql 2014-03-19 11:40:23 +01:00
Laurent Destailleur
20ef4554e0 Fix: missing unique key on barcode field to avoid database corruption 2014-03-18 23:43:58 +01:00
Laurent Destailleur
9be52ca2c8 Fix: better way to remove duplicate barcode in repair.sql 2014-03-18 22:16:18 +01:00
Laurent Destailleur
a574997191 Qual: Add unique keys constraints on barcode. 2014-03-17 20:52:06 +01:00
Laurent Destailleur
e491a4dce7 Add code to clean duplicate records 2014-03-17 20:29:01 +01:00
Laurent Destailleur
7974ae96ad Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr 
into aternatik-cat_extrafields

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-03-16 21:38:29 +01:00
Laurent Destailleur
eb5e891cf9 Fix: Not mandatory field must not be not null 
Fix: field to store amount must be double(24,8)
 2014-03-16 20:37:43 +01:00
Jean-François Ferry
55750e16d8 Prepare extrafields into categories 2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
0083e529c7 Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost 2014-03-16 14:31:02 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
c9ac7fad82 Fix: Field should not be not null 2014-03-15 15:45:21 +01:00
Laurent Destailleur
271c2a8929 Merge pull request #1472 from atm-maxime/mko1074 
Task 1074 : add link to source document on stock movement
 2014-03-15 13:21:04 +01:00
jfefe
32bef2bf2f Missing text attribute on input field 2014-03-15 07:01:02 +01:00
Maxime Kohlhaas
67342486a6 Task 1074 : add link to source document on stock movement 2014-03-15 02:18:39 +01:00
Laurent Destailleur
4154f07dfd New: Add a public url as a property for products/services. 2014-03-14 13:51:46 +01:00
Laurent Destailleur
aab4800f87 Fix: sql syntax error with pgsql 2014-03-14 12:50:45 +01:00
Laurent Destailleur
3c842f9b6f New: Add barcode fields into user database. 2014-03-13 09:11:14 +01:00
aspangaro
12ffb19cec Use more explicit name for class and functions 2014-03-11 06:26:18 +01:00
aspangaro
fca29f4312 Add table into script migration && key language 2014-03-06 21:29:20 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
d54dce1dbe Merge pull request #1452 from KreizIT/develop 
Correct multiline comments not manage by dolibarr
 2014-03-06 18:24:27 +01:00
Laurent Destailleur
cd3e56a2d0 Merge pull request #1450 from grandoc/develop 
fix english misspelling
 2014-03-06 18:23:51 +01:00
Laurent Destailleur
e9b9491a35 Clean database. Fix with firefox. 2014-03-05 12:15:47 +01:00
KreizIT
a80ecc8052 Correct multiline comments not manage by dolibarr 
Avoid error in loading data and also loading data which not be to.
 2014-03-05 12:06:01 +01:00
Laurent Destailleur
e9adec49eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-05 11:22:12 +01:00
Laurent Destailleur
60327e92d1 New: Add filter on text and status into survey list. Can also sorter on 
id, text and date end.
 2014-03-05 11:22:01 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
KreizIT
c1f88d99b9 Batch number management step 1 : database modification 2014-03-03 14:11:19 +01:00
BENKE Charles
e5e7b4ce6a Update llx_00_c_pays.sql 
adding burundi in pays database
 2014-03-01 12:30:39 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Florian Henry
92dc21be04 Fix project task numbering rule 2014-02-23 10:24:30 +01:00
Laurent Destailleur
e62b6c1cc4 Fix: Not using correct vars names 2014-02-11 15:43:05 +01:00
Laurent Destailleur
598098ff18 Fix: Not using correct vars names 2014-02-10 16:09:21 +01:00
Laurent Destailleur
444bc1c6a1 New increase length of url into bookmark module. 2014-02-10 16:05:13 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
e71fb36b3c Add patch ISO 9362 http://fr.wikipedia.org/wiki/ISO_9362 manually. 
We keep bic size field to 20 instead of 11 for backward compatibility.
 2014-02-10 01:08:49 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
94be4ec897 Fix: Avoid error in migration from 3.1 version. 
Fix: Suggested migration choice was ko from x.y.z to x.y.z+1
 2014-02-08 14:55:27 +01:00
Laurent Destailleur
59a25832bd Fix: Removed large comment into migration script 2014-02-08 12:16:27 +01:00
aspangaro
05c8039cf9 Delete rowid in case of an other accountancy plan already exist. 2014-02-02 09:50:53 +01:00
aspangaro
fda0dec260 Add The base accountancy belgium plan for accounting - Thanks delcroip 
http://www.dolibarr.fr/forum/12-howto--aide/47966-pcmn-plan-comptable-minimum-normalise-belgique
 2014-02-02 06:45:05 +01:00
Laurent Destailleur
5b218c3c5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-01-31 10:10:38 +01:00
Laurent Destailleur
bb7fc8631b Qual: Uniformize index name to match 
http://wiki.dolibarr.org/index.php/Language_and_development_rules#SQL_rules
 2014-01-31 10:08:25 +01:00
Jean-François Ferry
a0c3527e30 Fix : bad sql request during migration 2014-01-29 19:19:23 +01:00
Laurent Destailleur
7c01fd98b3 Fix: use allowed database types 2014-01-28 15:45:00 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
b3229a4021 Qual: Add error message if using wrong parameter into upgrade.php script 
First try to test migration into travis.
 2014-01-15 19:23:33 +01:00
Laurent Destailleur
d72167d543 Code comments 2014-01-15 19:12:55 +01:00
Marcos García de La Fuente
fc7d3d4771 Modified migration script to not remove columns 2014-01-06 05:39:22 +01:00
Marcos García de La Fuente
c245e86b60 Little changes to the opensurvey_sondage table definition 2014-01-06 05:17:02 +01:00
Marcos García de La Fuente
c2c97ec82a Mailsonde should not be a varchar 2014-01-06 05:12:47 +01:00
Marcos García de La Fuente
e0c7eb545c Email and poll author are now retrieved from the logged user 2014-01-06 05:08:42 +01:00
Marcos García de La Fuente
8d96675607 Force logged user to create surveys and applied Dolibarr style to poll creation wizard 2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
c9db0c3a94 Removed “stupid” feature to allow voters edit other users’ vote 2014-01-04 19:51:44 +01:00
Marcos García de La Fuente
13d4ea4c38 Added a new feature to disable spying other users’ vote 2014-01-03 23:30:15 +01:00
Marcos García de La Fuente
1a038fac06 Removed the use of id_sondage_admin and survey_link_visible fields of llx_opensurvey_sondage 2014-01-03 22:13:15 +01:00
Marcos García de La Fuente
a5b9122e98 Allow to disable poll comments 2014-01-03 17:44:42 +01:00
BENKE Charles
94bf105b13 Update llx_projet_task.sql 
new field "ref" present on update sql but not on the table
 2013-12-27 17:14:56 +01:00
BENKE Charles
e9ef9b6e8d Update llx_projet_task.sql 
new field "ref" present on update sql but not on the table
 2013-12-25 15:02:21 +01:00
Laurent Destailleur
692b2985ef Prepare 3.6 2013-12-15 00:05:04 +01:00
Laurent Destailleur
db10740e2a Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks 
Feature/multicompanybookmarks
 2013-12-13 18:52:38 -08:00
Laurent Destailleur
eaf151d7f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
 2013-12-14 03:13:46 +01:00
Raphaël Doursenaud
5e642f3009 Bookmarks multicompany migration 2013-12-10 12:00:42 +01:00
Raphaël Doursenaud
071dd8e758 Make bookmarks module multicompany aware 2013-12-10 12:00:42 +01:00
Laurent Destailleur
3c0c9019b5 Comment 2013-12-08 15:40:22 +01:00
Laurent Destailleur
1e50543496 Merge pull request #1331 from GPCsolutions/35b-review 
Fixes for 3.5 beta
 2013-12-01 20:34:51 -08:00
Laurent Destailleur
bfd229d484 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 18:14:19 +01:00
Laurent Destailleur
cbf1ddaa17 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 16:01:33 +01:00
Raphaël Doursenaud
e24555822e Fixed install generated $dolibarr_main_url_root_alt path 
We now use relative paths.
So let's remove the absolute part from the install generated configuration file.
 2013-11-29 17:28:17 +01:00
Laurent Destailleur
b71406f12d Merge pull request #1322 from aspangaro/develop 
Improvement of the Skype button
 2013-11-26 07:29:37 -08:00
Grand Philippe
1f7e6a42c2 add a Social contributions type and fix some language stuff 2013-11-24 11:33:36 +01:00
Laurent Destailleur
9156e9168f Add upgrade script 2013-11-23 13:19:55 +01:00
Laurent Destailleur
63e1ecccd3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-20 12:46:05 +01:00
Laurent Destailleur
b04a12c39a Missing vat rate for canada 2013-11-20 12:45:38 +01:00
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
Laurent Destailleur
e8101e3cde Fix: Missing field 2013-11-18 12:00:42 +01:00
Laurent Destailleur
930328f235 Prepare 3.5 beta 2013-11-17 03:33:58 +01:00
Laurent Destailleur
5b243abe4b Fix: Miscellaneous fixes 2013-11-16 12:00:08 +01:00
Laurent Destailleur
1e008ede3c Merge pull request #1298 from Pfontaine/features/multi_rib 
Features/multi rib
 2013-11-15 06:27:58 -08:00
Peter Fontaine
b965103fc3 Multiple Bank Account Number for Third Party 2013-11-13 15:40:17 +01:00
Laurent Destailleur
995bec6112 Fix: bad migration of 3.4 that make this text instead of varchar(50) 2013-11-13 15:09:22 +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
Raphaël Doursenaud
be30cb8cbf Removed unused tables from installer 
Fixes installer bug
 2013-11-07 15:57:24 +01:00
Laurent Destailleur
b2308ba65c Merge pull request #1284 from GPCsolutions/links 
Links
 2013-11-06 17:15:49 -08:00
Laurent Destailleur
51ad76b6de fix: minor syntax rules 2013-11-06 12:53:43 +01:00
Cédric Salvador
89f9a871d0 updated migration script 2013-11-06 10:19:17 +01:00
Cédric Salvador
ae8fea2615 new attributes 2013-11-06 10:17:18 +01:00
Cédric Salvador
06af0733e9 rename parameter to rowid 2013-11-06 10:11:40 +01:00
Cédric Salvador
26aa0c1d7a links sql table 2013-11-06 10:11:40 +01:00
aspangaro
76263213ab Merge branch 'origin/develop' 2013-11-04 22:04:36 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Florian Henry
c465cc621d Fix actioncomm_ressource column name 2013-11-04 19:27:59 +01:00
Florian Henry
f727e832d9 Add mandatory and transparent into llx_actioncomm_ressource 2013-11-02 02:25:06 +01:00
Florian Henry
c0ad86cd5c Add column fk_c_element_role into llx_actioncomm_ressource to manage 
role of linked element
In this exemple we can have 
fk_element = 1
element_type= "user" or contact or place or whatever element
fk_c_element_role = 1 // 'Guest' or Host or whatever define in
dictionnary
fk_c_element_status = Present // or whatever define in dictionnary
according element type
 2013-10-31 13:23:38 +01:00
Florian Henry
70bbe10f9e Start Task 172 2013-10-31 01:21:09 +01:00
Florian Henry
27e4852a35 upgrade process to change const SOCIETE_DONOTSEARCH_ANYWHERE to 
COMPANY_DONOTSEARCH_ANYWHERE
 2013-10-30 12:27:36 +01:00
Florian Henry
f512ef344a Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE 
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
 2013-10-30 12:24:51 +01:00
Laurent Destailleur
966f135316 Fix: Migration must load new boxes 2013-10-26 16:18:28 +02:00
Laurent Destailleur
315e2e4c13 Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into 
defrance69-patch-14

Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
 2013-10-20 14:12:56 +02:00
Laurent Destailleur
f87afaac10 Suggest a better page name 2013-10-19 14:38:49 +02:00
Laurent Destailleur
7b53ad5580 Fix: Missing field required by update_price 2013-10-18 01:09:41 +02:00
Laurent Destailleur
fa1e56b976 Code comment 2013-10-15 15:17:33 +02:00
Laurent Destailleur
b039dc94f5 Missing migration of new table 2013-10-13 14:53:40 +02:00
BENKE Charles
bafea2c4eb Rename contrat_extrafields.sql to llx_contrat_extrafields.sql 2013-10-09 18:17:59 +02:00
BENKE Charles
943bb2afc7 Create llx_contrat_extrafields.key.sql 
add contrat extrafields key file
 2013-10-09 18:16:56 +02:00
BENKE Charles
637417e1d4 Create contrat_extrafields.sql 2013-10-09 18:14:19 +02:00
Laurent Destailleur
141258f514 Merge remote-tracking branch 'origin/3.4' into develop 
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-10-07 16:17:51 +02:00
BENKE Charles
5bae0dbc18 Update 3.4.0-3.5.0.sql 2013-10-06 17:14:50 +02:00
BENKE Charles
6b909746f4 Update llx_societe.sql 2013-10-06 17:14:14 +02:00
Laurent Destailleur
2ffb16b99d Fix: permissions on files. 2013-10-02 23:48:13 +02:00
Laurent Destailleur
4eb4c5f922 Some users report they need more time 2013-09-27 11:04:21 +02:00
Laurent Destailleur
db7bcfd748 Fix: Sending email from thirdparty must add event into agenda if option 
is on.
 2013-09-25 21:36:40 +02: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
42f5ca15df Fix: Add missing field info_bits into predefined invoices. 2013-09-19 14:58:35 +02:00
simnandez
7f21e596dd [ task #1063 ] Allow edit localtaxes rate for thirds. Init Works 2013-09-17 17:17:59 +02:00
BENKE Charles
14e96f5c1b Update 3.4.0-3.5.0.sql 2013-09-17 10:39:30 +02:00
BENKE Charles
1f503948a8 Update llx_societe.sql 
add outstanding value
 2013-09-17 10:15:24 +02:00
Raphaël Doursenaud
3c08ca5b71 Fixed SQL install script for PostgreSQL 2013-09-11 17:12:51 +02:00
Raphaël Doursenaud
cbb763ab3f Fixed installer with DoliDB abstract class 2013-09-11 15:48:25 +02:00
Laurent Destailleur
edaeaf3803 Fix: field is not mandatory 2013-09-08 00:23:32 +02:00
Raphaël Doursenaud
36a281ce58 CSS fixes 2013-09-05 20:54:19 +02:00
Raphaël Doursenaud
4efe215b0c Qual: removed a bunch of duplicated array keys 2013-09-05 17:00:18 +02:00
Florian Henry
5ea6518a6d Fix PgSQL upgrade process failed 2013-08-26 10:47:43 +02:00
lalaina rasamoelina
8a4041e534 T975-develop Add an element (statut) in the table llx_socpeople 
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
 2013-08-22 11:04:06 +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
60a1fce2d1 Sec: Do not autofill password for remote access 2013-08-06 17:26:05 +02:00
Laurent Destailleur
80e04e967c Start to uniformize default debian package with current official 
package on work.
 2013-08-06 03:10:51 +02:00
Laurent Destailleur
af026690d4 Fix: Bad sql requests 2013-08-01 12:22:05 +02:00
Maxime Kohlhaas
bfb01da04f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011 2013-07-30 16:22:13 +02:00
Maxime Kohlhaas
5a38a43c87 Task # 1011 : now supplier order and invoice deal with payment terms and mode 2013-07-30 16:21:39 +02:00
Maxime Kohlhaas
dae36229a4 Task # 1011 : add payment terms and payment mode on supplier card 2013-07-30 15:06:57 +02:00
Cédric Salvador
6927274d2a copyright 2013-07-29 12:31:05 +02:00
Cédric Salvador
aae8a62368 added the desiredstock parameter in the SQL scripts 2013-07-29 12:31:04 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
e3b38cf3bb Fix: SQL Syntax error. 
Fix: A ref_ext can not be NOT NULL.
New: Add tms field into table llx_bordereau_cheque.
 2013-07-19 14:09:17 +02:00
Laurent Destailleur
09fd904e76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/ecm/index.php
 2013-07-19 14:01:47 +02:00
Maxime Kohlhaas
7abc53698a Add RefExt field on RemiseCheque 2013-07-19 08:54:11 +02:00
Geoffrey
efacfc9aa3 Add Maghreb regions and departments 2013-07-18 16:49:56 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task 
[ task #925 ] Add ODT document generation for Tasks in project module
 2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
5329312dd3 Add table 2013-07-16 21:26:19 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Laurent Destailleur
f4dfac045a Fix: Bad default mysql driver 2013-07-14 20:20:52 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Laurent Destailleur
8f71e5fda2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2013-07-07 23:25:03 +02:00
Laurent Destailleur
05461c47cc Fix: vat rate for slovenia 2013-07-07 23:22:00 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
Laurent Destailleur
46c3b1eb1f Missing vat rate 2013-07-02 01:26:52 +02:00
Cédric Salvador
edc5de4f24 indentation 2013-07-01 15:42:14 +02:00
Cédric Salvador
96cea7b79a add the libname field in the migration script 
Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
 2013-07-01 15:42:14 +02:00
Cédric Salvador
aa4f2ba8fb made it possible to call a function from a library 
Conflicts:
	htdocs/install/mysql/tables/llx_cronjob.sql
	scripts/cron/cron_run_jobs.php
 2013-07-01 15:41:27 +02:00
Laurent Destailleur
17ed70230e Bad request 2013-07-01 11:45:09 +02:00
Laurent Destailleur
1c80f35080 Fix: Avoid duplicate of old lines 2013-06-30 22:19:36 +02:00
Florian Henry
1580f92b11 Fix bug for PGSQL Migration 3.4->3.5 
Fix bug on create invoice from contract
 2013-06-27 08:09:28 +02:00
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
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
7778a17a89 Qual: clean code from deprecated vars 2013-06-24 16:41:31 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Laurent Destailleur
562fa43d9d Fix: Message is not clear enough. 
Fix: Var was not initialized.
 2013-06-17 23:24:53 +02:00
Laurent Destailleur
bc5fa5972a Drop deprecated tables 2013-06-14 02:26:24 +02:00
Florian Henry
4f43ec0acf Add extrafield tables 2013-06-10 14:13:44 +02:00
Laurent Destailleur
368efc77e0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-06 18:56:59 +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
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
c60e94c723 Merge pull request #1018 from fappels/develop 
Added flemish legal forms to belgium entries
 2013-06-03 14:43:35 -07:00
Laurent Destailleur
12973dbdb4 Look: Minor enhancement 
Fix: Option to fix bug to send email on by default.
 2013-06-03 22:06:28 +02:00
Laurent Destailleur
b4c5114ee6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:26:01 +02:00
Laurent Destailleur
1ccde6ad04 Fix: syntax error 2013-06-03 19:25:12 +02:00
Francis Appels
1a480b4e68 modified abrviation of code 227 2013-06-03 16:34:44 +02:00
Laurent Destailleur
a1a8fac25c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-03 11:15:15 +02:00
Francis Appels
7c0f7e1630 Added flemish legal forms to belgium entries 
Added flemish legal forms to belgium entries, so flemish company can
show correct info on his commerial documents
 2013-06-01 17:21:39 +02:00
Laurent Destailleur
520101bdfb Fix: Missing vat rate 2013-06-01 02:52:25 +02:00
Laurent Destailleur
9b96e38a35 Fix: Update vat rates for canada 
Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-06-01 02:49:44 +02:00
Laurent Destailleur
0b3a52395d Fix: Missing mayotte 2013-06-01 02:21:39 +02:00
Raphaël Doursenaud
9f1eb0676b Fix install with PostgreSQL 
The language should be lowercase and unquoted
 2013-06-01 00:02:13 +02:00
Laurent Destailleur
06fc0eec5b Fix: Update vat rates for canada 2013-05-31 19:53:45 +02:00
Raphaël Doursenaud
53fdc3b514 Fix install with PostgreSQL 
The language should be lowercase and unquoted
 2013-05-30 16:31:27 +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
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +02:00