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
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
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
dce9c2bc76
Fiscal year - 1st step
2014-05-28 05:34:10 +02:00
aspangaro
0a670092d5
Fix :: Account_parent must be an int - Step 1
2014-05-23 02:23:32 +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
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
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
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
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
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
c9ac7fad82
Fix: Field should not be not null
2014-03-15 15:45:21 +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
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
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
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
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
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
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
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