Commit Graph

3444 Commits

Author SHA1 Message Date
Bruno Généré
966b31de0f Bug Fix : issue with commas in the SQL script. 2016-10-11 11:35:06 +02:00
Laurent Destailleur
44f9c65f6a Fix missing countries 2016-10-10 17:00:11 +02:00
philippe grand
df825e2d49 better help 2016-10-09 11:45:39 +02:00
philippe grand
c46f76c0f2 better help 2016-10-09 11:32:48 +02:00
Laurent Destailleur
77e87b3c07 NEW Add tooltip in payment term edition in dictionnary 2016-10-07 00:37:06 +02:00
Laurent Destailleur
c908af6758 Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month
NEW Develop new cdr (current or next month) for payment terms.
2016-10-07 00:06:59 +02:00
Laurent Destailleur
a91f93eeda Merge pull request #5831 from atm-florian/dev_fix5764_for_PgSQL
FIX : New add limit stock product by warehouse #5764 for PgSQL
2016-10-07 00:00:53 +02:00
Laurent Destailleur
db3e3642b0 NEW Can generate SEPA mandate for each bank account of your customers 2016-10-06 00:14:25 +02:00
Laurent Destailleur
9ad96c2be3 Debug module accountancy expert 2016-10-05 20:50:47 +02:00
Laurent Destailleur
dff7f73dc9 Better terminology 2016-10-05 18:31:55 +02:00
Laurent Destailleur
31ce725d73 Maxi debug of accountancy expert module 2016-10-04 19:31:05 +02:00
gauthier
71eb4ff1a0 NEW : ALTER TABLE in migration script 2016-10-04 16:07:23 +02:00
gauthier
b35a4eb1b2 Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month 2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1 NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month 2016-10-04 15:45:23 +02:00
Laurent Destailleur
3599f2c840 Uniformize code for recurring invoices 2016-10-04 12:31:45 +02:00
florian HENRY
d3146234b8 FIX : New add limit stock product by warehouse #5764 for PgSQL 2016-10-04 09:23:13 +02:00
Laurent Destailleur
45a808e034 NEW Generation of document is available on member card 2016-10-03 00:08:47 +02:00
Laurent Destailleur
96426de416 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 19:25:35 +02:00
Laurent Destailleur
56ae7bf328 Merge pull request #5822 from aspangaro/4.0-p1
Fix: Not remove expensereport from menu. Menu of the module still in module file descriptor
2016-10-01 19:00:41 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
b45ea754ec FIX #5748 Bug: Error updating to 4.0.1 with Postgresql. Field must be
varchar.
2016-10-01 16:58:35 +02:00
Laurent Destailleur
fcb00dbaf2 Fix missing unique key 2016-10-01 16:53:33 +02:00
aspangaro
34cad213da Fix: Not remove expensereport from menu. Menu of the module still in module file descriptor. 2016-10-01 07:37:26 +02:00
Laurent Destailleur
20ad359c9b FIX Warning to grant permission must be visible only if one module add
some permissions
2016-09-30 18:26:32 +02:00
Laurent Destailleur
5d26565199 Package add version into xml integrity file. 2016-09-30 15:41:08 +02:00
Laurent Destailleur
2a6d8e77db FIX Lost filter on opportunities 2016-09-30 11:45:36 +02:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
Laurent Destailleur
ccd7100b7f Minor code fix 2016-09-29 10:43:53 +02:00
Laurent Destailleur
8fc857fdcb Missing entity in the bookkeeping table 2016-09-29 10:10:32 +02:00
Laurent Destailleur
e99f115a8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/tables/llx_user.sql
2016-09-28 19:49:36 +02:00
Laurent Destailleur
2d6877ac67 Add tables to store working employee contracts 2016-09-28 19:33:51 +02:00
arnaud
c904b8030c Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD
Conflicts:
	htdocs/langs/en_US/users.lang
2016-09-27 15:25:29 +02:00
arnaud
b717d530cd NEW User date of employment added 2016-09-27 15:16:16 +02:00
Laurent Destailleur
586b223221 Work on remote integrity checker 2016-09-26 15:24:43 +02:00
Laurent Destailleur
0ab3728276 Merge pull request #5780 from aspangaro/5.0-p14
Review of subscription
2016-09-26 01:09:50 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
Laurent Destailleur
3eaec4d4b8 Uniformise fields in tables 2016-09-23 10:55:44 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
gauthier
576ef9e541 FIX : sql syntax for travis test 2016-09-21 09:31:40 +02:00
gauthier
d508d44fef NEW : migration script from 4.0.0 to 5.0.0 and langs 2016-09-20 12:10:25 +02:00
gauthier
a0ec91cb94 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse 2016-09-20 12:03:55 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
97e396af69 Work on module website 2016-09-17 21:03:20 +02:00
gauthier
7a0577ccfc NEW : add limit stock product by warehouse 2016-09-16 17:09:38 +02:00
Juanjo Menent
8b13c36670 Merge pull request #5735 from atm-ph/fix_4.0_error_sql
Fix bad query
2016-09-14 16:27:51 +02:00
Laurent Destailleur
20141ec9bc Fix default value of new table 2016-09-12 17:31:36 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
phf
bd734de437 Fix bad query 2016-09-12 09:52:35 +02:00
Laurent Destailleur
ce137e3987 Fix migration when field was added without null flag. 2016-09-10 17:58:13 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Juanjo Menent
ecfd3a0af5 Merge pull request #5722 from atm-ph/fix_4.0_multicurrency_rate_entity
Fix miss entity column in llx_multicurrency_rate
2016-09-08 18:16:21 +02:00
phf
7229b572dc Default entity 1 in llx_multicurrency_rate 2016-09-08 14:59:16 +02:00
phf
7917169961 Fix miss entity column in llx_multicurrency_rate 2016-09-08 14:53:59 +02:00
Sergiu Sandu
02698c5abb fileconf.php redundant else statements
Is it ok the 2 else blocks are the same?
2016-09-07 17:02:41 +01:00
florian HENRY
abda9146f1 FIX : cannot add order line (if fk column is not in user they whould be
NULL by defaut.
2016-09-07 11:32:45 +02:00
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +02:00
Laurent Destailleur
b01d1979f8 Merge pull request #5680 from aspangaro/5.0-p7
NEW: Move Expense report menu from module to menu files (Again)
2016-09-02 18:39:49 +02:00
Laurent Destailleur
91ede48390 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-01 11:37:40 +02:00
Laurent Destailleur
f04a3bf0c8 Fix sql error 2016-08-31 18:46:47 +02:00
Laurent Destailleur
3edb04c5b8 Fix missing migration to create entity 2016-08-31 12:54:44 +02:00
Laurent Destailleur
c49508c415 Revert "Fix migration for entity in remise table"
This reverts commit 452f7be441.
2016-08-31 12:52:25 +02:00
aspangaro
b5f093436e NEW: Move Expense report menu from module to menu files (Again) 2016-08-30 21:43:17 +02:00
Maxime Kohlhaas
452f7be441 Fix migration for entity in remise table 2016-08-30 14:44:35 +02:00
Laurent Destailleur
98eb3fec5a Fix avoid migration when already migrated 2016-08-29 21:07:36 +02:00
Laurent Destailleur
867525cc91 Fix missing migration instructions 2016-08-29 17:50:31 +02:00
Laurent Destailleur
c49c23df3d Fix debug project categories 2016-08-29 17:30:54 +02:00
Laurent Destailleur
b8201c9f86 Fix fk_soc can be null because we can set notification for users only. 2016-08-28 23:46:12 +02:00
Laurent Destailleur
2e7e5151b7 Merge pull request #5463 from hregis/develop_origin
New: Add entity field in llx_societe_remise_except and llx_societe_remise
2016-08-28 12:23:04 +02:00
Laurent Destailleur
bc8e203019 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-28 01:58:43 +02:00
Regis Houssin
6e40f9e700 Merge remote-tracking branch 'dolibarr/develop' into develop_origin
Conflicts:
	htdocs/core/class/html.form.class.php

Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
2016-08-25 10:15:26 +02:00
BENKE Charlie
777b9fe4d8 Update 4.0.0-5.0.0.sql 2016-08-23 11:28:10 +02:00
BENKE Charlie
4a2b7e1bba add link to commande fourn if resplenish 2016-08-23 11:25:14 +02:00
BENKE Charlie
8707bb04fb Update 4.0.0-5.0.0.sql 2016-08-17 16:38:02 +02:00
BENKE Charlie
5f587efc72 Update llx_facturedet.sql 2016-08-17 16:36:22 +02:00
Laurent Destailleur
15a40f6401 Fix default value of entity 2016-08-11 15:50:18 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
Laurent Destailleur
f1ee2bdddf Remove deprecated field 2016-08-09 13:10:34 +02:00
Laurent Destailleur
54b47d7f4f Fix edit of page in module website
Conflicts:
	htdocs/websites/class/website.class.php
2016-08-08 19:09:37 +02:00
BENKE Charlie
432fad6ed7 Update 4.0.0-5.0.0.sql 2016-08-07 14:22:05 +02:00
BENKE Charlie
908bf50e69 new : add user id on line for tracking feature 2016-08-07 14:16:56 +02:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
2016-08-05 13:12:43 +02:00
Laurent Destailleur
57a542d52d Fix: we still need gd 2016-08-05 04:45:05 +02:00
Juanjo Menent
28efc3e50f NEW Add Panama datas 2016-08-03 09:45:12 +02:00
Laurent Destailleur
7dec327995 FIX #5568 2016-08-01 15:43:40 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
e0c232548e Fix theme crazy after migration 2016-08-01 10:55:41 +02:00
Laurent Destailleur
246321cd8f Fix clean orphelins of leave request logs in repair tools
Fix date of supplier proposal missing.
2016-07-30 18:08:07 +02:00
Laurent Destailleur
0c456add13 A more complete example of odt template 2016-07-29 16:33:31 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
Laurent Destailleur
f54946bacb Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
2016-07-28 10:10:58 +02:00
Regis Houssin
6bf655c882 Merge remote-tracking branch 'dolibarr/develop' into develop_origin
Conflicts:
	htdocs/societe/class/societe.class.php

Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
2016-07-28 09:53:10 +02:00
Laurent Destailleur
2a28d77eeb FIX #5465 - Fix type account_parent 2016-07-27 19:53:16 +02:00
Laurent Destailleur
7e37cbb9e3 Fix resource module can't work because mandatory data not available. 2016-07-27 19:16:21 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
e747c39809 Add test on curl prerequisite. Remove test on GD lib. 2016-07-27 16:52:02 +02:00
Laurent Destailleur
eb06f56164 Fix bad version into error message 2016-07-27 16:49:00 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
2016-07-25 21:05:11 +02:00
Juanjo Menent
437a8b53ae Merge pull request #5530 from GPCsolutions/forcedinstallfixes
Forced install fixes
2016-07-25 10:24:33 +02:00
Laurent Destailleur
9c89bc4095 Remove deprecated tables and code 2016-07-23 10:57:27 +02:00
Raphaël Doursenaud
1cfa26d400
Fix HTML syntax for forced install process.
Make sure we have a space between attributes.
2016-07-23 02:01:57 +02:00
Raphaël Doursenaud
2c000c20da
Prevent PHP notice on unitialized variables.
These variables are expected to be uninitialized when the forced install
process is not used.
2016-07-23 02:01:49 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also,
event company "create" was not tracked by default like others.
2016-07-21 13:49:10 +02:00
Laurent Destailleur
b90ed8d677 Merge pull request #5375 from frederic34/charges
NEW select bank and payment mode for social contrib
2016-07-20 19:00:10 +02:00
Raphaël Doursenaud
f2a479695e
New: Improved forced install process
Tamper proofed the process by not relying on POST values for forced fields.
Disabled all fields set when $force_install_noedit is set.
Added a full-featured forced install config file template.

On the side:
Improved Dolibarr root and url detection.
Prevent install locking if install was not successful.
Added missing translation on failed administrator creation.
Better escaping of posted values.
2016-07-20 14:22:35 +02:00
Laurent Destailleur
038526bb71 Code comment 2016-07-18 14:40:10 +02:00
Laurent Destailleur
fd7c494cb6 Add VAT for cyprus 2016-07-18 13:20:04 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
Conflicts:
	htdocs/langs/en_US/companies.lang
2016-07-15 17:05:12 +02:00
Laurent Destailleur
00d80d827f To match new standard, next version will be called 5.0, 6.0, ... 2016-07-15 11:17:33 +02:00
Laurent Destailleur
f758f3466e Merge pull request #5260 from atm-gauthier/develop_add_selectbank_on_thirdparty_card
NEW : select default bank account on thirdparty card
2016-07-15 11:16:17 +02:00
frederic34
2de3d4ec7b Merge remote branch 'upstream/develop' into charges
Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-07-15 10:41:56 +02:00
Laurent Destailleur
74f28b3861 NEW Complete table llx_ecm_files with field generated_or_uploaded 2016-07-15 10:38:13 +02:00
Laurent Destailleur
409d6df067 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-15 10:27:34 +02:00
Laurent Destailleur
eb47ec5823 Drop another deprecated table llx_ecm_documents (replace by
llx_ecm_files)
2016-07-15 10:27:20 +02:00
Laurent Destailleur
09306ba974 Drop not used table llx_document_generator (list of generators must be
managed by submodules like are the templates of document or engines to
select emailing targets (scan of a dedicated dir)
2016-07-15 10:23:36 +02:00
frederic34
f25ff0581c sql changes 2016-07-15 10:07:02 +02:00
frederic34
7e3978c403 sql changes 2016-07-15 10:04:04 +02:00
Laurent Destailleur
da4d28ae3f Merge pull request #5359 from GPCsolutions/autoset_install
New: Autoset port and admin user from db type
2016-07-14 23:16:48 +02:00
Laurent Destailleur
ec6640af63 Add field virtualhost for website module 2016-07-14 15:54:46 +02:00
Laurent Destailleur
73f574b649 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/repair.php
2016-07-12 19:30:01 +02:00
Laurent Destailleur
a258663175 Fix edition of status were loosing old percent. We show it to allow user
to keep it if required.
2016-07-09 14:58:51 +02:00
Laurent Destailleur
47d7ac8031 Fix the repair tool to correct corrupted stock for batch numbers 2016-07-08 23:11:55 +02:00
Laurent Destailleur
a48c79b68b Fix corrupted stock 2016-07-08 23:02:25 +02:00
Laurent Destailleur
0f23cef46c Fix warning of the repair tool. 2016-07-08 18:59:36 +02:00
Laurent Destailleur
d940cc392a FIX Several fix to exclude WON/LOST of reporting of opportunities amount
(sometimes we need, sometimes not).
2016-07-08 10:59:13 +02:00
Regis Houssin
08725003b9 Fix: add entity field in llx_societe_remise, useful when third-sharing
is used with multicompany
2016-07-07 12:43:02 +02:00
Regis Houssin
ee02ff43d7 Fix: add entity field in llx_societe_remise_except, useful when
third-sharing is used with multicompany
2016-07-07 12:26:30 +02:00
Sof
9b5bcc6dcd FIX: Missing semicolon 2016-07-07 10:25:17 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
2016-07-06 14:53:05 +02:00
florian HENRY
2520ee921a llx_ecm_directories 2016-07-01 08:37:24 +02:00
florian HENRY
08fbc21bb1 llx_ecm_directories 2016-07-01 08:36:20 +02:00
florian HENRY
215f397f33 Cannot reproduce 4793 still fix other bug on PgSQL 2016-06-30 17:28:13 +02:00
florian HENRY
855550e274 FIX 4926 2016-06-30 17:00:09 +02:00
florian HENRY
8097298c80 FIX #4756 2016-06-30 16:55:59 +02:00
Laurent Destailleur
5950178c7a Fix create of admin user 2016-06-30 00:38:13 +02:00
Laurent Destailleur
266fef40ad Add a way to enhance security check. 2016-06-25 15:16:32 +02:00
Regis Houssin
25631b236b Fix: missing rename field "shortname" to "ref" 2016-06-23 16:47:21 +02:00
Laurent Destailleur
8356dd1080 Fix minor 2016-06-20 10:22:08 +02:00
Laurent Destailleur
b4384c13e1 Merge pull request #5349 from atm-maxime/3.9
FIX #5343
2016-06-16 20:19:08 +02:00
Laurent Destailleur
8e8b14af78 Merge pull request #5347 from olsesacl/develop-fix-install
Fix: install with mysql 5.7.9
2016-06-16 20:11:56 +02:00
Laurent Destailleur
a1c2f35ebb Merge pull request #5357 from ndrosis/patch-23
New TVA for Greece 24%
2016-06-16 20:08:16 +02:00
Raphaël Doursenaud
eb54c3f8af
Fix #5350 date_pointoftax prevented creating invoices 2016-06-16 13:09:11 +02:00
Drosis Nikos
5a51850d54 Greece VAT 23 -> 24 2016-06-16 14:03:11 +03:00
Raphaël Doursenaud
c365d14c2c
New: Autoset port and admin user from db type
[Usability]
Enhance install procedure by automatically suggesting the database
port and administrative user on database type selection.
2016-06-16 13:00:38 +02:00
Drosis Nikos
2ef3d7cedb New TVA for Greece 24% 2016-06-16 13:50:35 +03:00
Maxime Kohlhaas
f51386c59f FIX #5343 2016-06-15 08:06:22 +02:00
Sergio Sanchis Climent
d9d247e49d Fix install mysql 5.7.9 2016-06-14 00:37:13 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
09270aa8bd Not used table 2016-06-09 07:27:24 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
681249de8a Debug module resource 2016-06-06 12:29:15 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Maxime Kohlhaas
f2e4fdcce4 Fix import model not correctly saved #5185 2016-06-04 00:16:01 +02:00
Maxime Kohlhaas
8901b99e2d Fix import model not correctly saved #5185 2016-06-04 00:14:08 +02:00
gauthier
ab06ffda58 NEW : select default bank account on thirdparty card 2016-06-03 15:43:05 +02:00
Laurent Destailleur
537c9637f6 Merge pull request #5255 from atm-florian/dev_fix5151
FIX: #5151
2016-06-02 10:05:02 +02:00
Laurent Destailleur
7519c4a602 FIX Log of tax
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
2016-06-01 13:24:27 +02:00
Florian HENRY
d17a879f33 add into migratino script 2016-05-31 23:32:21 +02:00
Florian HENRY
3c42a32690 FIX: #5151 2016-05-31 23:22:15 +02:00
Laurent Destailleur
3ddf427ff1 FIX Legal issue for GB. Add hidden option for this. 2016-05-30 00:52:16 +02:00
Juanjo Menent
a63dac3a9c Merge pull request #5240 from fmarcet/peru
Fix: Update Peru regions and departaments
2016-05-28 11:51:46 +02:00
Laurent Destailleur
27da82df1f FIX Missing columns in migration 2016-05-26 21:20:10 +02:00
Laurent Destailleur
9a3251bcc9 FIX Missing columns in migration 2016-05-26 21:18:08 +02:00
Laurent Destailleur
db56e1b8a1 FIX Missing columns in migration 2016-05-26 21:17:43 +02:00
Your Name
c581b05c26 Fix: Update Peru regions and departaments 2016-05-23 18:38:55 +02:00
Laurent Destailleur
f398174772 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/menus/standard/auguria_menu.php
	htdocs/core/menus/standard/eldy.lib.php
2016-05-22 19:34:27 +02:00
Laurent Destailleur
db432e2cc4 Fix lot number 2016-05-21 18:12:03 +02:00
Laurent Destailleur
b95981a2be Fix missing ; at end of sql 2016-05-21 18:03:13 +02:00
Sof
da2c9a0f74 Syntax error : bad name of field 2016-05-19 17:42:57 +02:00
Laurent Destailleur
cd75b43d58 Can enable modules during migration 2016-05-18 00:44:55 +02:00
Laurent Destailleur
a36b780c53 Fix phpunit 2016-05-17 20:30:04 +02:00
Laurent Destailleur
be251cd2b0 Add high risk sql at end 2016-05-17 18:22:48 +02:00
Laurent Destailleur
d083ad9382 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/resource/class/html.formresource.class.php
2016-05-17 18:21:22 +02:00
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby
dates.
2016-05-17 18:19:36 +02:00
Laurent Destailleur
3b99fb01ee Fix duplicate table 2016-05-17 10:51:03 +02:00
Laurent Destailleur
63d0710842 FIX Creation of the second ressource type fails. 2016-05-17 10:44:30 +02:00
Laurent Destailleur
05cbfbb38f Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/install/mysql/migration/repair.sql
2016-05-17 01:19:49 +02:00
Laurent Destailleur
95ea20eb44 Clean code for stock movement when lot are used. We should not get
duplicate records into llx_product_batch
2016-05-17 01:10:11 +02:00
Laurent Destailleur
75b4c61fbc Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/contrat/card.php
2016-05-17 00:02:54 +02:00
Laurent Destailleur
94c532dd8a Clean splitted lines into llx_product_batch 2016-05-16 23:58:06 +02:00
Laurent Destailleur
929787006e Clean data 2016-05-16 22:40:29 +02:00
Ion Agorria
9b11907c70 Update existing linked elements to new type 2016-05-11 18:50:25 +02:00
Laurent Destailleur
9d3ad36b78 NEW If error is reported during migration process, you can ignore it to
avoid to be locked.
2016-05-09 11:06:18 +02:00
Laurent Destailleur
6bb269381a Merge pull request #5143 from frederic34/morecateg
categories account like other categories
2016-05-07 20:25:17 +02:00
Laurent Destailleur
82745d32df NEW Survey system has now a status like other objects. You can close or
reopen a survey.
2016-05-07 17:12:31 +02:00
Laurent Destailleur
cdbbe8d87b Minor fixes 2016-05-05 23:44:44 +02:00
Laurent Destailleur
aa55cdadac Merge pull request #4944 from FHenry/develop_advtargetemailiing
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
Laurent Destailleur
ed3e15b39e Merge pull request #5150 from fmarcet/peru
New: Add Perú regions
2016-05-05 22:48:02 +02:00
Laurent Destailleur
1f23909899 Merge pull request #5146 from aspangaro/4.0-p26
NEW: Accountancy - Prepare multiple journals
2016-05-05 22:46:36 +02:00
Laurent Destailleur
7e34581952 Merge pull request #5139 from aspangaro/4.0-p25
FIX: Accountancy - Chart of accounts are limited on only one country
2016-05-05 22:27:05 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
Laurent Destailleur
d69904c14d Can set the home page of web sites 2016-05-02 15:51:18 +02:00
fmarcet
bc43c87f51 New: Add Perú regions 2016-05-02 11:36:29 +02:00
Laurent Destailleur
f59f3032c6 NEW: Rename path for generic medias files into '/medias' instead of
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
aspangaro
88435a0d80 NEW: Accountancy - Prepare multiple journals 2016-05-01 08:03:40 +02:00
frederic34
17463b4927 categories account like other categories 2016-04-30 14:45:24 +02:00
aspangaro
7041a041ce FIX: Accountancy - Chart of accounts are limited on only one country 2016-04-30 06:52:21 +02:00
Laurent Destailleur
19162fc8d5 Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into
PeartreeG-patch-1

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/resource/element_resource.php
2016-04-29 18:31:11 +02:00
Juanjo Menent
5ca989c836 Merge pull request #5126 from FHenry/dev_fixpgsql
FIX Postgres migration from 3.9 to 4.0
2016-04-29 12:18:49 +02:00