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
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Laurent Destailleur
9c54dc57df Save some usefull cleaning requests into repair.sql 2014-09-17 12:31:35 +02:00
Laurent Destailleur
23eee1b83a New: Add hourly and daily amount on user card. Add weekly working hours 
and salary on user card.
 2014-09-13 17:41:26 +02:00
aspangaro
7cc3fe9c95 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-09 20:41:19 +02:00
Laurent Destailleur
27ba1680bf Add field weeklyhours. 2014-09-09 15:29:54 +02:00
Laurent Destailleur
9f2b0b4f29 Minor enhancement on agenda module. 
Can filter on date of event.
Local calendar renamed into Internal calendar.
 2014-09-09 12:28:35 +02:00
aspangaro
02f45b7f43 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-07 07:32:47 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00
Laurent Destailleur
a93ad958ac New: Add help info of field type into dictionary of payment types. 2014-09-05 09:33:12 +02:00
aspangaro
9f92446dba Merge branch 'Upstream/develop' 2014-08-31 07:44:46 +02:00
Laurent Destailleur
f64cb085a7 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-08-30 18:27:34 +02:00
aspangaro
bb7aa9f29c Merge branch 'Upstream/develop' 2014-08-29 06:33:00 +02:00
Laurent Destailleur
5e95daad91 Fix: Sql syntax error 2014-08-28 16:18:17 +02:00
Laurent Destailleur
22fb37f856 Fix: Sql syntax for extrafield table of interventions 2014-08-28 15:00:09 +02:00
Laurent Destailleur
b810e6e556 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-28 12:19:46 +02:00
Laurent Destailleur
dcce6731fe Fix: Sql errors 2014-08-28 12:19:24 +02:00
Laurent Destailleur
a1e92b464f Merge pull request #1848 from atm-alexis/develop_feature_intervention_lines_extrafields 
Feature  : Add extrafields on intervention's lines
 2014-08-28 12:00:43 +02:00
Laurent Destailleur
d43c6e57c7 Merge pull request #1843 from aspangaro/develop-patch1 
Fix :: Sql problem on resource table
 2014-08-28 11:44:26 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00
Laurent Destailleur
c3fe0c1ae9 Fix: sql errors into migration scripts 2014-08-26 23:08:06 +02:00
Laurent Destailleur
4b4360af32 Fix: sql syntax errors 2014-08-26 23:02:21 +02:00
Alexis Algoud
85228fd8e7 add support in admin 2014-08-26 11:50:02 +02:00
Alexis Algoud
a3469f1f01 FIX bug on migration 3.6 -> 3.7 2014-08-26 11:27:57 +02:00
aspangaro
b7daef10c6 Fix llx_c_type_resource when you update from a 3.6-beta 2014-08-26 04:35:22 +02:00
aspangaro
cd5d3f5368 Fix :: Sql problem on resource table 2014-08-22 07:19:14 +02:00
aspangaro
2aa3995b73 Fix :: Sql problem for fresh install on resource table // Ok in migration script 2014-08-21 06:01:47 +02:00
aspangaro
af92eb3725 Problem of merging 2014-08-20 07:49:53 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
Laurent Destailleur
1ec7d4b488 Vat rate 0 first 2014-08-17 23:32:42 +02:00
Laurent Destailleur
f32125497f Merge pull request #1830 from frederic34/patch-1 
Add VAT rates for Ireland (Eire)
 2014-08-17 23:29:39 +02:00
Laurent Destailleur
cf80f97b95 Fix: bad table name 2014-08-17 17:47:45 +02:00
Laurent Destailleur
45927cc986 Fix pb of links into state-region-country: 
- no more rowid into insert sql requests
- link, so foerign key must be on fk_region->code_region
- label was not visible
- unique keys must be into file .key.sql
 2014-08-17 17:47:25 +02:00
Frédéric FRANCE
8750b60a81 Update llx_c_tva.sql 2014-08-15 16:09:44 +02:00
Laurent Destailleur
aee35c86d6 Perf: Removed a useless distinct, add indexes. 2014-08-15 02:11:01 +02:00
Laurent Destailleur
37cc0dc4f3 Perf: Add missing index on projet_task_time table. 2014-08-15 01:32:18 +02:00
aspangaro
fe3939debe Drop old index 2014-08-14 06:42:28 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
Laurent Destailleur
de3d66eaeb 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-08-14 00:59:48 +02:00
Laurent Destailleur
e3f96802fb Fix: sql bad use. 
Qual: Incrase sql syntax test by phpunit to migration scripts. 
Qual: Removed old migration script before 3.0.0
 2014-08-14 00:09:09 +02:00
aspangaro
b465d71535 Renamed data table 2014-08-13 07:46:56 +02:00
Florian HENRY
eca9408c91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-08-12 12:37:31 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
aspangaro
9af336b53b Add accountancy code for trips & fees and renamed libelle field into label 2014-08-10 20:41:52 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
2169a8668d Fix: PHPCS 2014-08-06 09:18:44 +02:00
Laurent Destailleur
2bfde7ba30 Add table llx_holiday_types to store type of leave. 2014-08-06 03:01:17 +02:00
Laurent Destailleur
f863604621 Prepare table for email templates. 2014-08-05 12:28:10 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
96362b40e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-04 10:55:09 +02:00
Laurent Destailleur
be89fddc52 Uniformize field list 2014-08-04 10:54:22 +02:00
Laurent Destailleur
b5bb4c639c Fix: Clean data 2014-08-04 00:15:23 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
bf7a33494e Run request to clean data 2014-08-03 23:55:33 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
Laurent Destailleur
12ff7a8af5 Look: Refresh install style with more neutral colors. Select line style 
is now stored into css. Removed all images for install process.
 2014-08-03 11:18:32 +02:00
Laurent Destailleur
c11ff57fbe Fix: The type is a code so must not contains any space. 
Fix: State is not linked to region.
 2014-08-03 11:17:24 +02:00
Laurent Destailleur
331cb38a10 A little clean of tables. 2014-08-02 21:56:39 +02:00
Laurent Destailleur
8ed21f606e Qual: states are linked to regions. 2014-08-02 21:16:43 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Laurent Destailleur
852b78f79f Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for 
constants into database driver classes.
 2014-08-01 00:53:29 +02:00
Laurent Destailleur
1e09200347 Prepare to add foreign key toward parent into table 
llx_accountingaccount.
 2014-07-31 20:49:50 +02:00
Laurent Destailleur
b78537730a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-31 20:39:03 +02:00
Laurent Destailleur
218fb88eef Merge pull request #1788 from aspangaro/develop-accounting2 
Accountancy :: account_parent must be an int (again)
 2014-07-31 20:17:49 +02:00
Laurent Destailleur
9fff30416a Qual: Remove usage of getStaticMember function dir constants. 2014-07-31 20:12:21 +02:00
Laurent Destailleur
2d97ad5177 Merge pull request #1771 from frederic34/selectdelivery 
Select Shipping Method in Propal, Order
 2014-07-30 11:31:22 +02:00
aspangaro
a12f4da978 Accountancy :: account_parent must be an int (again) 2014-07-30 05:49:16 +02:00
Juanjo Menent
2783ec7dc8 New: Add PYME (base) accountancy spanish plan 2014-07-29 00:00:34 +02:00
Juanjo Menent
09af3e1efe New: Add PYME (base) accountancy spanish plan 2014-07-28 23:22:50 +02:00
frederic34
395b003266 Merge remote branch 'upstream/develop' into selectdelivery 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-28 17:10:07 +02:00
Laurent Destailleur
3d56c8ff6a Fix: [ bug #1537 ] Difference between societe.nom and adherent.societ 2014-07-26 18:20:40 +02:00
frederic34
4fcff3e2e5 Select delivery method for order 2014-07-25 17:20:42 +02:00
frederic34
f0a7cc3268 Select Shipping Method in Propal 2014-07-24 18:08:08 +02:00
frederic34
2b3bd260c6 Update llx_c_shipment_mode.sql 2014-07-24 10:26:11 +02:00
frederic34
304e9d2c83 Update llx_c_shipment_mode.sql 
Update GLS tracking url
 2014-07-24 09:45:46 +02:00
Florian HENRY
cf63f1a40d Remane contract ref_ext to ref_supplier 2014-07-21 08:36:59 +02:00
Laurent Destailleur
d80de2cdd4 Fix: Clean before adding foreign key 2014-07-20 04:42:05 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Florian HENRY
d0cc935cd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-12 10:16:08 +02:00
Laurent Destailleur
2766b1d8f1 Add record for argentina but disabled by default. 2014-07-11 17:43:57 +02:00
Laurent Destailleur
f1ef8b8faa Comment entries 2014-07-11 17:34:01 +02:00
Florian HENRY
d2e17eb321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-07-11 16:09:01 +02:00
Laurent Destailleur
4dfaf9ce38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661 New: Type of thirdparties can accept a country (to show list of types 
specific for a country).
 2014-07-11 13:56:35 +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
Florian HENRY
c7d31f4570 [ task #1204 ] Add ref_int contract field 2014-07-11 11:26:54 +02:00
Raphaël Doursenaud
d476ca4a68 Support gigaoctets of session memory 2014-07-10 15:01:37 +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
932206a152 Fix: phpunit 2014-07-08 21:04:17 +02:00
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