Laurent Destailleur
37b6a15dbb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-02 19:13:44 +01:00
Laurent Destailleur
d88173d7ba
Fix bad column
2020-12-02 19:13:32 +01:00
Laurent Destailleur
9d2a78003e
Merge pull request #15606 from Zebedeu/develop
...
New add VAT RAT for Angola
2020-12-02 18:34:32 +01:00
Laurent Destailleur
38b67b0de6
Merge pull request #15616 from dolibit-ut/patch-54
...
Update llx_accounting_account_ca.sql
2020-12-02 18:31:58 +01:00
Laurent Destailleur
409b73fe2c
FIX #15582
2020-12-02 15:16:04 +01:00
Marcio Zebedeu
561c7438bc
New Add Angola City name
...
Angola province/city support added
2020-12-02 12:36:15 +01:00
Marcio Zebedeu
73edd081dd
New Support for Angolan currency added
...
Support for Region Angola added
2020-12-02 12:04:35 +01:00
UT from dolibit
8944670c03
Update llx_accounting_account_ca.sql
...
subtype_pcg removed
2020-12-02 08:28:16 +01:00
Stephane Lesage
1c4876b417
more transporters in llx_c_shipment_mode.sql
2020-12-01 21:17:03 +01:00
Marcio Zebedeu
f7a8a02b98
Update llx_c_tva.sql
2020-12-01 20:07:58 +01:00
Marcio Zebedeu
de9a32972f
New currency for Angolan added
...
Support for Angolan currency added
2020-12-01 19:48:49 +01:00
Marcio Zebedeu
ea1393a7cb
New add VAT RAT for Angola
...
VAT rate support for Angola was added.
2020-12-01 19:29:11 +01:00
lmarcouiller
bca89fc204
add dolibarr_state_board in migration
2020-12-01 15:57:15 +01:00
UT from dolibit
9d1da25f03
Update llx_const.sql
2020-12-01 13:57:33 +01:00
UT from dolibit
f847425f23
Update llx_accounting_abc.sql
2020-12-01 13:48:18 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
6a8ddacb33
Prepare database to allow to disconnect other session after a password
...
change
2020-11-29 21:01:57 +01:00
Laurent Destailleur
de98ef1718
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2020-11-29 20:57:43 +01:00
Laurent Destailleur
d45fe6c17f
FIx #15551
2020-11-29 20:39:39 +01:00
Laurent Destailleur
fab9b3d50c
Fix warning
2020-11-28 18:34:13 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
4a5cdd0092
Several fixes in export and repair tool
2020-11-27 15:27:35 +01:00
Frédéric FRANCE
1704de39bb
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-27 11:18:04 +01:00
Frédéric FRANCE
9a2f945807
Merge remote-tracking branch 'upstream/develop' into patch-13
2020-11-27 11:15:10 +01:00
BENKE Charlene
c2bd30a7e9
working progress
2020-11-26 11:59:00 +01:00
BENKE Charlene
c860c0dc4a
Add default BOM
2020-11-26 11:47:45 +01:00
Laurent Destailleur
e1a6e8f2fc
CSS
...
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
d8bf7b2714
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
2020-11-25 18:04:06 +01:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop
...
Fix bank transfert supplier
2020-11-25 13:06:10 +01:00
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-25 12:59:32 +01:00
Florian HENRY
e2b96a834d
add SCOP and SCIC in ent form juridique
2020-11-25 12:11:00 +01:00
Florian HENRY
12ef03f06d
fix banck tranfert supplier
2020-11-25 10:58:34 +01:00
Jean-Sébastien Pédron
9b1dbf8d2a
llx_accounting_account_fr.sql: Remove left over field data
...
In commit 86d9622360a85dfaf71e
2020-11-24 22:19:21 +01:00
Laurent Destailleur
47cfdb4ef2
Prepare database to be ready for a future fix on sessions
2020-11-24 11:38:05 +01:00
Frédéric FRANCE
2225ff0ba4
Update 12.0.0-13.0.0.sql
2020-11-23 23:59:37 +01:00
Frédéric FRANCE
909a723d48
Update llx_ecm_files.sql
2020-11-23 23:57:56 +01:00
Frédéric FRANCE
886945829e
Update llx_ecm_directories.sql
2020-11-23 23:56:03 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
32ae1bf350
Sync transifex
2020-11-18 15:56:06 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
UT from dolibit
1f8a8459fa
Update llx_c_currencies.sql
2020-11-13 11:25:58 +01:00
Laurent Destailleur
b71cd0edea
Merge pull request #15378 from orebd/debug_ticket
...
Fix some tickets issue
2020-11-13 09:58:57 +01:00
Laurent Destailleur
6d4d3c618d
FIX #15369 and standardize permission "readall"
2020-11-13 09:55:53 +01:00
Aurélien
d9d32524f7
Fix #14460
2020-11-13 00:36:25 +01:00
Laurent Destailleur
7be3a2267e
Add missing vat rates
2020-11-12 22:23:21 +01:00
jcp
10ae18fe44
Update SQL migration
2020-11-12 19:42:20 +01:00
Frédéric FRANCE
1b6dfee2bd
modify sql
2020-11-11 13:56:45 +01:00
Laurent Destailleur
42ea51be49
Fix migration
2020-11-11 07:43:45 +01:00
Frédéric FRANCE
c796d3e3e7
do not reset ref if already entered
2020-11-10 23:10:42 +01:00
Frédéric FRANCE
016c9915ef
Update 12.0.0-13.0.0.sql
...
add ref in class
add ref in getNomUrl
add ref on card
2020-11-10 23:03:03 +01:00
Frédéric FRANCE
22713ae9fb
Update llx_adherent.key.sql
2020-11-10 22:19:21 +01:00
Frédéric FRANCE
87678bff7f
Update 12.0.0-13.0.0.sql
2020-11-10 22:14:37 +01:00
Frédéric FRANCE
8650054c34
Update llx_adherent.sql
2020-11-10 22:11:03 +01:00
Alexandre SPANGARO
82d1f99010
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-11-10 04:09:00 +01:00
jcp
eb0fd1674d
Update ICS
2020-11-09 18:40:57 +01:00
bahfir abbes
11099132da
New: add notification on ACTION_CREATE event
2020-11-06 00:48:23 +01:00
Laurent Destailleur
529d7ca9cb
Merge pull request #15305 from fappels/13_fix_reception_update
...
Fix sql error reception update, tms is auto timestamp
2020-11-05 19:22:55 +01:00
Regis Houssin
6348a64369
FIX missing rename file date_m to tms
2020-11-05 18:45:30 +01:00
Alexandre SPANGARO
61bca50fa6
NEW: Dictionary for availability - Add column position
2020-11-05 16:56:28 +01:00
Francis Appels
1ca0083eb8
Fix sql error reception update, tms is auto timestamp
...
remove deprecated
2020-11-05 14:30:30 +01:00
Laurent Destailleur
c399721345
Update doc
2020-11-05 09:16:51 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
49ccf2a3cb
Update doc
2020-11-01 15:55:51 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
0a9c7fc577
Look and feel v13
2020-10-31 04:19:22 +01:00
Laurent Destailleur
cb3e204281
Fix use of dolibarr_main_distrib
2020-10-30 13:06:55 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Laurent Destailleur
19b82047f0
Fix sql
2020-10-27 10:00:35 +01:00
Laurent Destailleur
07729ec431
Merge pull request #15150 from FHenry/dev_fix_migration_livraison_to_delivery
...
fix migration livraison to delivery
2020-10-26 19:28:59 +01:00
Laurent Destailleur
0abce469e9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-26 19:09:08 +01:00
Laurent Destailleur
f18a13b2d4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/class/productcustomerprice.class.php
2020-10-26 19:08:11 +01:00
Laurent Destailleur
3ee618d736
FIX Clean orphan records in llx_ecm_files into repair script.
2020-10-26 18:31:12 +01:00
Marc de Lima Lucio
f4e63bb046
NEW: ref in product customer price: add fields in database
2020-10-26 10:52:22 +01:00
Florian HENRY
949be12e19
fix migration livraison to delivery
2020-10-25 17:26:15 +01:00
Laurent Destailleur
8578a7cd7c
Fix regressions
2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Drosis Nikos
6ea9befb48
Add & Update tva for Greece
2020-10-16 15:20:12 +03:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
...
NEW : Nature of product is now a dictionay
2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/class/expensereport.class.php
2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/class/expensereport.class.php
2020-10-15 20:38:32 +02:00
Florian HENRY
a0d1e96bfd
fix table creation for intracom and change reserved name column name
2020-10-15 11:37:44 +02:00
Florian HENRY
0597768ea8
fix review
2020-10-15 08:28:38 +02:00
Florian HENRY
50a9bd368c
review
2020-10-14 18:15:48 +02:00
Florian HENRY
940d478aec
UI and db OK
2020-10-14 15:54:48 +02:00
Florian HENRY
77de8c242c
commit add table
2020-10-14 12:24:35 +02:00
Laurent Destailleur
805fa00422
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-13 15:09:24 +02:00
Laurent Destailleur
035325152f
Fix migration
2020-10-13 15:02:05 +02:00
Aurélien
abfcb73a45
FIX unkwown columm tms #14947
2020-10-13 12:10:06 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport
...
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
45e2a6409e
Missing field
2020-10-12 11:30:53 +02:00
Laurent Destailleur
b36b9170b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-10 15:45:22 +02:00
Laurent Destailleur
437eead694
Fix bad permission
2020-10-10 15:45:04 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Francis Appels
4fb83a0dd6
Fix migration
2020-10-09 15:35:09 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Aurélien
3daf530a92
Revert "update dependencies migration12->13.sql #14697 "
...
This reverts commit 5fa481422a
2020-10-08 18:52:17 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Aurélien
5fa481422a
update dependencies migration12->13.sql #14697
2020-10-08 15:56:44 +02:00
Regis Houssin
111f73bd86
FIX add default value of timestamp for avoid error
2020-10-08 12:29:01 +02:00
Laurent Destailleur
4674eda45a
Standardize columns comment
2020-10-08 10:13:44 +02:00
Aurélien
9c02390066
fix migration12->13.sql #14697
...
fix drop constraint
fix error on update extrafields
2020-10-07 21:50:54 +02:00
Aurélien
16e076d182
fix UPDATE llx_extrafields.elementtype = livraison to delivery #14697
2020-10-07 20:54:56 +02:00
Laurent Destailleur
c7ca99accb
Fix default value of enabled property of menu entry
2020-10-07 15:38:07 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Aurélien
d103a9aede
rename table on migration #14697
2020-10-06 14:35:27 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
Aurélien
140200213e
change table into DB and ref #14697
2020-10-06 11:04:31 +02:00
Alexandre SPANGARO
d83d9895e0
NEW Vat report - Invert constant to show by default zero vat in reports
2020-10-05 20:52:31 +02:00
Laurent Destailleur
1c34868028
Fix field must be null because there is no numbering ref module yet
2020-10-03 11:16:31 +02:00
Laurent Destailleur
c2fed95dc4
FIX #14877
2020-10-02 19:54:06 +02:00
Frédéric FRANCE
b78e506e39
add files
2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm
2020-10-02 00:21:13 +02:00
Laurent Destailleur
14736bee63
Merge pull request #14852 from inovea-conseil/newfieldwebsite
...
NEW website page fields
2020-10-01 19:31:14 +02:00
Florian
c89f8b323b
Rename fk_typeobject to type_object
2020-10-01 15:18:19 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
29414251f5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2020-09-29 13:19:03 +02:00
Nicolas
dfba9a06ad
NEW Field to link website page to an other object
2020-09-28 20:39:02 +02:00
Inovea Conseil
789defa46f
Merge remote-tracking branch 'Dolibarr/develop' into newfieldwebsite
2020-09-28 20:08:22 +02:00
Laurent Destailleur
4cf6e483ca
Fix export of various payments.
2020-09-28 18:49:20 +02:00
Florian
bdb38da9d3
Add 2 new field typeObject and ObjectId to website
2020-09-28 18:17:23 +02:00
Laurent Destailleur
0dcd85485a
Fix migration
2020-09-25 12:36:32 +02:00
Laurent Destailleur
7a9332815c
Fix migration
2020-09-25 12:22:24 +02:00
Laurent Destailleur
83bdd530cd
Fix sql error in menu edition, column too short
2020-09-25 10:13:45 +02:00
Laurent Destailleur
bc7b5b1468
Update website templates for v13
2020-09-24 21:37:21 +02:00
Laurent Destailleur
80ec1ad69f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-09-23 19:29:07 +02:00
zecsn
98dc0bbb6e
Reformat comments
2020-09-23 16:53:04 +05:00
zecsn
a4c8a5a69d
Fix SQL Error
...
Fix SQL Error DB_ERROR_SYNTAX on Installation
2020-09-23 16:43:53 +05:00
atm-lena
0fc6e9b84f
FIX - Backtick not work with postgresql
2020-09-23 10:54:49 +02:00
Laurent Destailleur
5f4547bf7c
Prepare table for future features
2020-09-22 10:38:16 +02:00
Laurent Destailleur
c4ef21a8f2
Increase timeout delay for install
2020-09-21 14:04:46 +02:00
Laurent Destailleur
84cc04a2c6
Increase timeout delay for install
2020-09-21 14:04:07 +02:00
Laurent Destailleur
d38168f49e
Fix escape
2020-09-19 22:59:04 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
8029b80f08
Fix install hangs
2020-09-17 13:03:34 +02:00
Laurent Destailleur
b690bab1a8
Fix regression: missing column
2020-09-16 01:06:54 +02:00
Laurent Destailleur
5c31593d43
Add date of birth in candidatures
2020-09-16 00:47:44 +02:00
Laurent Destailleur
1015d3c026
Merge pull request #14716 from 99Deon/develop
...
fix bug in "llx_c_ticket_category.sql" table .
2020-09-14 00:17:16 +02:00
Cédric
29931bbded
Update 12.0.0-13.0.0.sql
2020-09-12 18:55:26 +02:00
Cédric
1f5419c883
Update llx_paiement.sql
2020-09-12 18:53:02 +02:00
chkernit
7252022afe
fix problem in table "llx_c_ticket_category.sql"
...
when install dolibarr project the step of creation tables does not completed because there are a bug in create llx_c_ticket_category.sql table .
2020-09-12 16:33:07 +01:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
05a2fc6186
Fix rate for tunisia
2020-09-10 19:40:03 +02:00
Laurent Destailleur
177ec5eb39
Fix mandatory field
2020-09-09 19:25:16 +02:00
Laurent Destailleur
e439eb636e
Merge pull request #14660 from FHenry/dev_updatedocker
...
Update Docker build to new standard (version 3 of docker-compose)
2020-09-09 15:26:06 +02:00
Laurent Destailleur
86ed4dfa2b
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 11:51:36 +02:00
Laurent Destailleur
c91338198d
Add some fields in candidature
...
Look and feel v13
2020-09-08 01:53:37 +02:00
Florian HENRY
07242a1c5d
Merge branch 'develop' into dev_updatedocker
2020-09-07 15:43:03 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
52fe2a4d96
Merge pull request #14642 from nlouahedj/develop
...
NEW Algeria data (tva and forme_juridique)
2020-09-05 11:36:47 +02:00
Noureddine LOUAHEDJ
8d7bbe3dcb
NEW tva Algerie
2020-09-05 08:58:51 +01:00
Noureddine LOUAHEDJ
ebf718fdae
NEW forme_juridique Algerie
2020-09-05 08:58:29 +01:00
Laurent Destailleur
84f4020f49
Update llx_facturedet.sql
2020-09-04 23:12:12 +02:00
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8
2020-09-04 23:11:00 +02:00
Cédric
c5fda967c7
add field ref_ext in llx_facturedet
2020-09-04 22:57:21 +02:00
Laurent Destailleur
b2c20c3dfd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-04 22:42:48 +02:00
Laurent Destailleur
451c878cfc
Fix add missing field
2020-09-04 22:42:37 +02:00
Cédric
e9d6e04c25
NEW field ref_ext in llx_commandedet
2020-09-04 21:36:01 +02:00
Cédric
38bc98cf7d
ADD ref_ext field in llx_facturedet
2020-09-04 19:38:24 +02:00
Laurent Destailleur
092b66a7f1
Add variation_ref_ext field
2020-09-04 13:35:16 +02:00
Laurent Destailleur
1ceb7c8677
Add ref_ext to product_attribute.
2020-09-04 12:41:56 +02:00
Laurent Destailleur
5d40380a07
Add index on status
2020-09-01 15:17:52 +02:00
Florian HENRY
0099d98096
Merge remote-tracking branch 'origin/develop' into dev_updatedocker
2020-09-01 14:32:49 +02:00
Laurent Destailleur
887d4e0603
Add unique key on table of inventory details
2020-08-31 20:02:06 +02:00
Florian HENRY
9614dcf9ec
fix comment
2020-08-29 18:38:26 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
8e70a731d3
doc
2020-08-29 04:42:14 +02:00
Laurent Destailleur
c6bdd27d4c
FIX #14530
2020-08-27 21:52:25 +02:00
Laurent Destailleur
8f34f4c1c5
FIX #14530
2020-08-27 21:46:28 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master
2020-08-27 19:58:29 +02:00
ATM john
236d2862af
Fix install table
2020-08-26 21:56:50 +02:00
atm-lena
cc29654f47
WIP : rename fk_project to fk_actioncomm + add line to sql file to install
2020-08-26 16:48:09 +02:00
atm-lena
a01d1b58c7
Add fk_email_template
2020-08-26 16:06:20 +02:00
atm-lena
cf9337b644
Add fk_project to actioncommreminder object
2020-08-26 15:58:14 +02:00
atm-lena
552e655668
Add field "entity" in actioncommrminder object and table
2020-08-26 15:22:32 +02:00
Laurent Destailleur
7c39543c72
Support trigger in module recruitment
...
Enhance generic code of automatic recording events
2020-08-25 12:47:38 +02:00
Laurent Destailleur
60d76000d7
Fix bad column name
2020-08-24 17:23:33 +02:00
andreubisquerra
e032ddc035
Change variable to pos_change
2020-08-23 22:27:18 +02:00
andreubisquerra
ec2479a41a
Update 12.0.0-13.0.0.sql
2020-08-23 22:26:22 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
3fe0ffe7e2
Add unique index on email_msgid of candidatures
2020-08-23 15:18:31 +02:00
Laurent Destailleur
ca2a34a4c9
Standardize code: Rename fields date_m into tms. All timestamp fields
...
are now name "tms".
2020-08-23 15:15:47 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
jove@bisquerra.com
d9cbd8f998
NEW: Print payment method and change in TakePOS
2020-08-22 18:28:15 +02:00
Laurent Destailleur
03af14294a
Standardize code. Debug module HRM
2020-08-22 15:29:19 +02:00
Laurent Destailleur
dabe804299
Add numbering modules for candidatures. Mass action Validate.
2020-08-22 03:49:46 +02:00
Laurent Destailleur
a508e7ae08
Migration
2020-08-21 22:17:20 +02:00
Laurent Destailleur
e6616563d2
Fix size of field
2020-08-21 22:01:28 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Laurent Destailleur
0390111132
Add column bomtype
2020-08-20 23:32:35 +02:00
Laurent Destailleur
eb15a8e4db
Enhance email collector module
2020-08-20 23:03:57 +02:00
Laurent Destailleur
2f18ab0ea9
Debug generation of document for warehouse
2020-08-18 14:55:56 +02:00
Laurent Destailleur
58e25768a7
NEW Add PDF document templates for warehouses (list of stock)
2020-08-18 14:02:36 +02:00
Laurent Destailleur
816aeadcba
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge
...
NEW : Declinaison price level compatibility
2020-08-16 23:18:49 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
John Botella
41cbe6db12
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge
2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf
Add declinaison price level
2020-08-12 10:14:29 +02:00
atm-thibaultf
10810bc5bb
Modify int to float for stock limit alert and desired stock
2020-08-12 09:09:59 +02:00
Laurent Destailleur
4e6158d23c
Work on recruitment module
2020-08-08 02:54:14 +02:00
Laurent Destailleur
dd510901a4
Fix duplicate field
2020-08-07 14:05:15 +02:00
Laurent Destailleur
e72e05d5f5
Add field default_lang for users
2020-08-07 13:31:23 +02:00
Laurent Destailleur
7a03521664
Doc
2020-08-07 12:07:34 +02:00
Laurent Destailleur
561520b44c
WIP Recruitment module
2020-08-06 16:06:15 +02:00
Laurent Destailleur
43b23994e4
WIP Recruitment module
2020-08-06 15:55:04 +02:00
Laurent Destailleur
e830e7f3d3
Work on recruitment module
2020-08-06 13:14:43 +02:00
Laurent Destailleur
d9818405c6
Fix regression for v13
2020-08-02 22:30:23 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
aca20c89f9
Can use a generic email for recruitment
2020-08-02 18:45:42 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
ecfdb4bbac
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-02 16:02:09 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
44cfb77622
FIX #14292
2020-07-29 12:43:53 +02:00
Laurent Destailleur
81cb5501bc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
2020-07-28 10:32:27 +02:00
Laurent Destailleur
4e4f0a4575
Use same case for all sql files
2020-07-28 09:44:48 +02:00
Laurent Destailleur
6e36fba4f3
NEW Development of module Recruitment
2020-07-24 11:54:57 +02:00
Laurent Destailleur
895fe63d3b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-24 01:53:51 +02:00
Laurent Destailleur
431b207dab
Fix to solve sql error on some databases
2020-07-24 01:02:07 +02:00
ATM john
921e904acc
Fix MySQL rank usage for column
2020-07-23 20:34:11 +02:00
Laurent Destailleur
8d26329653
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
htdocs/projet/activity/perday.php
2020-07-19 02:24:26 +02:00
Laurent Destailleur
d598039f20
Merge pull request #14218 from Ahuahuachi/12.0
...
Update Mexico City name
2020-07-19 02:01:12 +02:00
Laurent Destailleur
48adeb9dd7
FIX #14256
2020-07-19 01:38:38 +02:00
Laurent Destailleur
31cb57afc9
Fix regression with ecoterm
2020-07-18 23:27:43 +02:00
Laurent Destailleur
179f3d44c6
Merge pull request #14238 from dolibit-ut/patch-32
...
Update llx_c_incoterms.sql
2020-07-18 19:09:26 +02:00
UT from dolibit
60f904bbd3
Update llx_c_incoterms.sql
...
add column label for short standard term in english
(libelle to use for long description (in user language))
2020-07-14 14:15:44 +02:00
UT from dolibit
7184fba8c6
Update llx_c_incoterms.sql
...
add column 'label' for short term description in english
add new Incoterm DPU (DAT is obsolete , but let it stay for older documents)
2020-07-14 13:59:16 +02:00
Alfredo Altamirano
6aae68bb07
Change Mexico City name
...
Mexico City official name and code changed since 2016
2020-07-11 10:49:05 -05:00
Laurent Destailleur
eede2f9944
Add telangana province for india
2020-07-11 10:39:12 +02:00
Alexandre SPANGARO
1855d54019
Fix data insertion
2020-07-06 04:31:32 +02:00
Alexandre SPANGARO
0525dd3c1f
Fix migration - Move to v13
2020-07-06 03:28:53 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
6a37d12bd9
Fix sql type
2020-07-04 16:10:13 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
26c6e2d92e
Clean code
2020-07-02 03:34:28 +02:00
Laurent Destailleur
5afd518718
Update vat rate for Congo
2020-06-30 13:06:44 +02:00
Laurent Destailleur
146c521efd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
600a24346a
Some people are missing this table
2020-06-28 22:09:17 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
2de1433818
FIX #14142
2020-06-28 21:05:36 +02:00
Laurent Destailleur
e2b1b853c0
Minor performance enhancements
2020-06-26 01:44:21 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
989737af6b
Update website templates
2020-06-19 10:36:19 +02:00
Laurent Destailleur
6c2d70d43b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 19:27:39 +02:00
Laurent Destailleur
2f687a3c40
FIX #14033
2020-06-17 17:57:32 +02:00
Laurent Destailleur
f0e4fa40f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:42:07 +02:00
Laurent Destailleur
b90a45ed7a
Complete #14078
2020-06-16 22:41:50 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2
2020-06-16 22:40:45 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2
Fix and improvement on Loan module
...
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
with the new value.
* Can't modify interest in payment if schedule is used (causes the
inconsistency for value in schedule).
* User right verification on schedule page.
2020-06-13 09:32:44 +02:00
Laurent Destailleur
dc87d89204
Update 12.0.0-13.0.0.sql
2020-06-12 01:03:58 +02:00
Laurent Destailleur
c27eb5e623
Update llx_const.sql
2020-06-12 01:03:34 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-12 01:00:15 +02:00
Laurent Destailleur
77c1c46285
Merge pull request #14032 from ptibogxiv/patch-343
...
NEW convert all subscription in datetime
2020-06-12 00:47:55 +02:00
Anthony Berton
c00b55c980
Update 11.0.0-12.0.0.sql
2020-06-11 18:45:35 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:44:38 +02:00
Anthony Berton
ce7767a154
Create 11.0.0-12.0.0.sql
2020-06-11 18:39:44 +02:00
Anthony Berton
3214b5f199
Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:37:25 +02:00
Anthony Berton
4a77d06b1e
o
2020-06-11 15:45:31 +02:00
Anthony Berton
848c9df537
Add files via upload
2020-06-11 15:38:05 +02:00
Laurent Destailleur
a70e493c5d
Migration
2020-06-08 11:43:00 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
941362e683
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
180a0a4557
Info for debug
2020-06-07 18:30:46 +02:00
Laurent Destailleur
f19064abfa
Merge pull request #14044 from dolibit-ut/patch-29
...
create index.html
2020-06-06 21:08:11 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Laurent Destailleur
5dd9f4e4c4
Fix travis false positive
2020-06-06 11:36:24 +02:00
UT from dolibit
38b359392a
create index.html
2020-06-06 02:06:55 +02:00
Laurent Destailleur
ca3f62e4ac
Doc repair Row size too large
2020-06-05 17:47:52 +02:00
Laurent Destailleur
c7a614bd50
Fix clean data
2020-06-04 17:07:22 +02:00
ptibogxiv
319710d6aa
Update 12.0.0-13.0.0.sql
2020-06-04 16:50:24 +02:00
ptibogxiv
7da6a063f9
Update llx_subscription.sql
2020-06-04 16:46:36 +02:00
Laurent Destailleur
2324834b73
Debug modulebuilder for doc generation
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
58e76947ac
Debug modulebuilder for doc generation
2020-06-01 16:44:22 +02:00
Laurent Destailleur
f63aa7f527
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
2020-05-31 23:27:20 +02:00
Laurent Destailleur
67f007ea40
Fix length of field. Make some module die.
2020-05-31 23:12:26 +02:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
c2a9819daa
Debug establishment management
2020-05-29 21:45:50 +02:00
Laurent Destailleur
5a9d968a75
Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting
2020-05-29 00:02:03 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
9d7a4cae00
Fix default value
2020-05-28 17:49:56 +02:00
Christian Foellmann
50bac41399
fix #13988 - missing batch field extension
2020-05-28 15:19:48 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
15f2165c12
Fix work on payment by bank transfer (avoid confusion between record)
2020-05-27 20:14:11 +02:00
Laurent Destailleur
2f1e653f2f
Fix css
2020-05-27 15:29:09 +02:00
Laurent Destailleur
34d7dbe7e9
Fix css
2020-05-27 14:42:17 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:19:50 +02:00
Laurent Destailleur
02b9ce5901
Fix length of title
2020-05-25 18:16:36 +02:00
Laurent Destailleur
0b9e1e6ec6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 13:01:49 +02:00
Laurent Destailleur
0409ec00d7
CSS
2020-05-25 13:01:32 +02:00
Laurent Destailleur
0041bca82f
Fix ambiguous param
2020-05-24 23:49:33 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
Laurent Destailleur
bf0327952b
Merge pull request #13875 from ptibogxiv/patch-339
...
NEW Date shipment from order accepts hours
2020-05-23 15:42:24 +02:00
Laurent Destailleur
aec5200a98
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Laurent Destailleur
4913d10724
Merge branch 'develop' into patch-339
2020-05-23 15:14:06 +02:00
Francis Appels
875230ed13
Fix missing batch update to varchar(128)
2020-05-23 10:23:26 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a636f81eac
add new rule
2020-05-21 02:17:21 +02:00
Laurent Destailleur
15f3c97fff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:59:11 +02:00
Laurent Destailleur
662970f232
Clean sql file
2020-05-20 23:42:28 +02:00
Laurent Destailleur
92cbff7749
Clean code
2020-05-20 23:40:04 +02:00
Laurent Destailleur
954d928467
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 20:11:13 +02:00
Laurent Destailleur
cce72ad8d6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/bills.lang
htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b
suggest some fix to debug situation invoices
2020-05-20 19:51:04 +02:00
Laurent Destailleur
2f7786f50f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 10:37:43 +02:00
Laurent Destailleur
51ed77fbf7
Fix
2020-05-20 09:59:01 +02:00
Anthony Berton
702627155c
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-19 15:20:18 +02:00
Laurent Destailleur
514009ca6d
Add field position in llx_website
2020-05-18 15:47:21 +02:00
Anthony Berton
ceb3ba0e33
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-16 16:42:20 +02:00
Anthony Berton
e1f8b50961
Delete 11.0.0-12.0.0.sql
2020-05-16 15:39:49 +02:00
Anthony Berton
ddb413c025
Create 12.0.0-13.0.0.sql
2020-05-16 15:37:13 +02:00
ptibogxiv
8d242cacae
Update 12.0.0-13.0.0.sql
...
update sql
2020-05-15 16:04:36 +02:00
ptibogxiv
e00152a845
Rename 12.0.0.-13.0.0.sql to 12.0.0-13.0.0.sql
2020-05-15 16:03:38 +02:00
ptibogxiv
6a0bc86ea6
Create 12.0.0.-13.0.0.sql
2020-05-15 16:03:03 +02:00
ptibogxiv
703fee0635
Update llx_commande.sql
2020-05-15 15:58:01 +02:00
ptibogxiv
1453b8469e
Update 11.0.0-12.0.0.sql
2020-05-15 15:56:16 +02:00
Laurent Destailleur
215cf9e6f8
Prepare v13
2020-05-14 16:45:32 +02:00
Laurent Destailleur
adcc9e14f6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 16:35:39 +02:00
Laurent Destailleur
92b245ae93
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-14 16:34:24 +02:00
Laurent Destailleur
49cfc1afd8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/install/upgrade2.php
2020-05-14 16:20:04 +02:00
Laurent Destailleur
b26c1757e6
Prepare v13
2020-05-14 16:07:23 +02:00
Laurent Destailleur
cf039b26f9
Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7
...
FIX 9.0 - fatal during migration from 3.1 using PHP 7
2020-05-14 15:49:08 +02:00
Anthony Berton
06c08ad045
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-14 15:26:58 +02:00
Laurent Destailleur
68512e0281
Look and feel v12
2020-05-14 14:56:15 +02:00
Laurent Destailleur
a796122f7b
Fix to solve feedbacks of
...
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 14:30:32 +02:00
Laurent Destailleur
1bd00b0e8c
Fix to solve feedbacks of
...
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 12:28:17 +02:00
Florian Mortgat
bd3504c473
FIX 9.0 - delete unused mandatory argument from migrate_clean_association: argument count mismatch causes a fatal error since php7
2020-05-13 10:26:44 +02:00
ptibogxiv
c6e7b2e6a3
Fix date shipment from order
...
better for pickup collection with date and hour from order
2020-05-12 13:39:02 +02:00
Laurent Destailleur
310c5f9eb6
Fix size of field
2020-05-09 21:56:51 +02:00
Laurent Destailleur
bba8ab657e
Fix add missing migration
2020-05-08 18:57:15 +02:00
Laurent Destailleur
c98663be4a
Fix sql
2020-05-08 14:05:04 +02:00
Laurent Destailleur
94d47c2acd
Fix sql
2020-05-08 14:04:17 +02:00
Laurent Destailleur
206b16410e
Revert the option to avoid to introduce a feature that is duplicate with
...
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Anthony Berton
00b9f8445f
Add default const
2020-05-04 17:11:44 +02:00
Laurent Destailleur
4d6a45d491
Major doxygen fix
2020-05-03 22:48:35 +02:00
Laurent Destailleur
c2c0e6517f
Fix init data of units D and H.
2020-05-01 22:44:46 +02:00
Laurent Destailleur
3957b74d9a
Revert "FIX: add auto incrementation to llx_c_typent.sql"
...
This reverts commit 14a3aa2165
2020-05-01 22:17:33 +02:00
Laurent Destailleur
994b60b1d8
Revert use of autoincrement not possible with value 0
2020-05-01 22:17:13 +02:00
Laurent Destailleur
efb79a4008
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-01 22:16:21 +02:00
Laurent Destailleur
10af669719
Fix missing autoincrement
2020-05-01 22:14:09 +02:00
Maxime Lecoq
14a3aa2165
FIX: add auto incrementation to llx_c_typent.sql
2020-04-30 18:21:25 +02:00
kkhelifa-opendsi
908c653743
Merge branch 'develop' into stcommcontact
2020-04-28 09:03:17 +02:00
Laurent Destailleur
a40c2fdbfc
Debug v12
2020-04-28 02:58:33 +02:00
Laurent Destailleur
fb8bdefbaa
Look and feel v12
2020-04-28 02:10:26 +02:00
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
068a890c36
Enable more PHPCS rules
2020-04-25 19:13:20 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
da02863242
Code comment
2020-04-23 12:19:51 +02:00
Laurent Destailleur
69f4a3e7b0
Doc
2020-04-23 11:41:03 +02:00
Laurent Destailleur
39c454d07b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
8598fd99c2
if not exists not required
2020-04-22 18:08:02 +02:00
Frédéric FRANCE
63186a60ae
Update 11.0.0-12.0.0.sql
2020-04-22 14:23:38 +02:00
Laurent Destailleur
22162ac57e
Fix rounding of quantities
2020-04-22 13:14:50 +02:00
Laurent Destailleur
292d93405d
Merge pull request #13667 from frederic34/patch-4
...
Update 11.0.0-12.0.0.sql
2020-04-22 01:04:24 +02:00
Laurent Destailleur
11e9cc68b7
Merge pull request #13666 from frederic34/patch-1
...
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
2020-04-22 00:37:19 +02:00
Laurent Destailleur
042fb4641f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/de_DE/install.lang
htdocs/langs/de_DE/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/projects.lang
2020-04-21 18:33:11 +02:00
Laurent Destailleur
f670a68b04
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/mails.php
2020-04-21 18:29:50 +02:00
Laurent Destailleur
f6735ce8f2
Update repair.sql script
2020-04-21 14:28:52 +02:00
Frédéric FRANCE
b0069f4fed
Update 11.0.0-12.0.0.sql
2020-04-20 18:46:11 +02:00
Frédéric FRANCE
f09fa5226a
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
2020-04-20 18:43:05 +02:00
Laurent Destailleur
f816fae86c
Fix a duplicated index
2020-04-20 12:21:13 +02:00
Laurent Destailleur
16806da9b5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-18 15:49:56 +02:00
Laurent Destailleur
f0f28c83cd
Add fk
2020-04-18 15:49:40 +02:00
Laurent Destailleur
f6e77fc0ba
Merge pull request #13602 from oscim/patch-37
...
Update llx_commandedet.key.sql
2020-04-18 15:48:53 +02:00
Laurent Destailleur
e050429854
Update llx_commandedet.key.sql
2020-04-18 15:48:45 +02:00
Laurent Destailleur
2f2e3d5057
Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty
...
NEW : Extend retained warranty to be available for all invoices
2020-04-18 15:32:33 +02:00
Laurent Destailleur
07ce3fc34d
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-04-18 11:08:21 +02:00
Laurent Destailleur
0ab8c47988
css
2020-04-18 11:07:57 +02:00
ATM john
c334a931de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-16 20:29:54 +02:00
Laurent Destailleur
619014726e
Fix char of account of us
2020-04-16 17:19:18 +02:00
Frederick Jost Zweig
49d5469904
Added basic charts of accounts for USA and Canada.
2020-04-15 13:29:51 +03:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
oscim
f4c346cdbb
Update llx_commandedet.key.sql
...
add external key
2020-04-14 07:48:34 +02:00
Laurent Destailleur
52b467d2fc
FIX #13550 Removed not used table
2020-04-12 19:06:44 +02:00
Laurent Destailleur
08301e2696
Merge pull request #13567 from atm-maxime/new_expensereport_tab_remove
...
Remove expense report tab from user
2020-04-12 17:11:37 +02:00
Laurent Destailleur
51eea01505
Merge pull request #13584 from pstructures/develop
...
Installation issue
2020-04-12 16:38:08 +02:00
Matt Sidnell
7c72e40659
Installation issue
...
Installation SQL issue due to a ';' instead of a ','.
2020-04-12 15:21:14 +01:00
Frédéric FRANCE
33a926e251
Update llx_categorie_website_page.key.sql
2020-04-12 09:08:27 +02:00
Maxime Kohlhaas
2ef787c7ff
Remove expense report tab from user
2020-04-11 17:38:54 +02:00
Laurent Destailleur
6a955da4e9
Merge pull request #13546 from oscim/patch-33
...
Update llx_societe.key.sql
2020-04-11 01:31:29 +02:00
Laurent Destailleur
47f00f8bc8
Update llx_societe.key.sql
...
Keep only fields that are enough discriminent for new indexes
2020-04-11 01:31:03 +02:00
Laurent Destailleur
eb3ed7ffdf
Complete index on tickets
2020-04-10 20:02:57 +02:00
Laurent Destailleur
6960f79e40
Update llx_ticket.key.sql
2020-04-10 19:59:45 +02:00
philazerty
0aab98abff
Index optimization for ticket
...
When there are a lot of tickets, the search can be long without these indexes.
2020-04-10 17:05:53 +02:00
Laurent Destailleur
5ff981bf61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/perms.php
2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7
Fix permission to close a proposal or order was not correctly used
...
#13547
2020-04-10 11:54:14 +02:00
Laurent Destailleur
8567001a46
Merge pull request #13549 from oscim/patch-34
...
Update llx_societe_rib.key.sql
2020-04-10 11:11:13 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
oscim
2887ae3f00
Update llx_societe_rib.key.sql
...
fix key in table
2020-04-10 08:54:39 +02:00
oscim
2df7d79421
Update llx_societe.key.sql
...
Add index in table for optimise search in big database
2020-04-09 15:54:25 +02:00
Laurent Destailleur
87ff94fc64
Add generic fields
2020-04-05 03:59:23 +02:00
Laurent Destailleur
8454598722
WIP Add tables to manage categories of website pages.
2020-04-04 18:59:26 +02:00
Laurent Destailleur
9849afd3dd
WIP Add tables to manage categories of website pages.
2020-04-04 18:53:38 +02:00
Laurent Destailleur
237615aa71
Fix offset for ecuador must be ID of country so 84 + 5 zeros
2020-04-03 02:35:55 +02:00
Laurent Destailleur
b669aca1a0
Merge pull request #13483 from fabianpc/db_ecuador
...
NEW : Chart of accounts to Ecuador
2020-04-03 02:32:30 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
3408f67348
Clean orhpelins in llx_product_association
2020-04-02 16:00:09 +02:00
Laurent Destailleur
c225f35eff
Update 11.0.0-12.0.0.sql
2020-04-02 12:49:20 +02:00
Christian Foellmann
6aa65f1a02
change batches max length to 128 characters on sql migration
2020-04-01 09:57:51 +02:00
Laurent Destailleur
6f0071bebe
FIX sort on company on member list
2020-03-31 17:54:48 +02:00
Fabian Palacios
ae4fb855d7
chart of accounts to Ecuador
2020-03-31 10:10:22 -05:00
Fabian Palacios
db18226493
Chart of accounts to Ecuador
2020-03-31 10:08:37 -05:00
ATM john
035bb671f2
Fix sql ; missing
2020-03-31 16:32:07 +02:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
Laurent Destailleur
be3cc164c6
Increase size for unalterable logs record.
2020-03-30 18:41:21 +02:00
Laurent Destailleur
398812afa5
Add field to store version of encoding of line in blockedlog
2020-03-30 17:47:29 +02:00
Laurent Destailleur
5b5f4a900c
Fix css of buttome of recommended choice
2020-03-29 23:14:51 +02:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
fa3bba942f
Start to save the VAT src code into table of discounts to reuse them
...
later
2020-03-26 02:01:30 +01:00
Laurent Destailleur
e937b22721
Increase batch number to 128
2020-03-25 19:34:52 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
01e60562b9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
1e955a89ef
FIX #13399 after #13285 and #13183
2020-03-23 15:28:18 +01:00
Alexandre SPANGARO
89de39f199
Move supplier proposal menu to the core
2020-03-23 08:51:38 +01:00
Laurent Destailleur
226f4695cd
Fix migration of type of field
2020-03-22 19:48:53 +01:00
Laurent Destailleur
8313ed9ee4
Merge pull request #13388 from OPEN-DSI/new-type-category-from-hook
...
NEW add category type from hook
2020-03-22 19:45:31 +01:00
Laurent Destailleur
7145754376
Can set different warehous, lot during production
2020-03-22 17:06:59 +01:00
VESSILLER
ac5d2fedc5
NEW add category type from hook
2020-03-20 15:40:46 +01:00
Laurent Destailleur
6b3826cbb8
Merge branch 'develop' into patch-25
2020-03-18 19:47:25 +01:00
Anthony Berton
82058f3a78
add phone
2020-03-18 01:17:54 +01:00
Anthony Berton
71e22ee11b
Update 11.0.0-12.0.0.sql
2020-03-18 00:55:20 +01:00
Alexandre SPANGARO
af5444806d
Work on reconcilation of accouting account
2020-03-16 06:41:14 +01:00
Alexandre SPANGARO
bc717bc6ae
Work on reconciliation of accouting account
2020-03-15 07:49:24 +01:00
Laurent Destailleur
6f636d6d69
NEW Add field author public alias for blog post on website module
2020-03-12 20:50:36 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18
...
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-11 17:08:49 +01:00
Laurent Destailleur
42d417d5d5
Trans
2020-03-08 16:32:00 +01:00
Laurent Destailleur
d0f22c7bff
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_graph_product_distribution.php
2020-03-06 14:22:42 +01:00
Laurent Destailleur
fff7ee3e96
FIX #13285 SQL error during migration with pgsql
2020-03-06 01:55:36 +01:00
Alexandre SPANGARO
d9b9913e8a
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-01 04:52:12 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Laurent Destailleur
f5a07dfb7e
Add status into popup
2020-02-28 18:57:17 +01:00
Alexandre SPANGARO
98db5232d1
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 14:05:30 +01:00
Alexandre SPANGARO
a85dfaf71e
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 12:09:19 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
Laurent Destailleur
1d0dad1e80
Merge pull request #13200 from dolibit-ut/patch-3
...
Update README
2020-02-26 05:11:45 +01:00
Laurent Destailleur
d172a95dfe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-25 14:37:04 +01:00
UT from dolibit
e4e8173b7a
Update README
2020-02-25 13:15:15 +01:00
Laurent Destailleur
1cda54c1f3
CSS using the SVG
2020-02-24 06:16:50 +01:00
Laurent Destailleur
5c2fe5f780
Fix migration
2020-02-24 03:06:50 +01:00
Laurent Destailleur
4b4d1bcce2
Fix disable accountancy chart that is deprecated.
2020-02-24 03:05:58 +01:00
ATM john
13790422dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-24 00:18:37 +01:00
Laurent Destailleur
090b0e90d2
FIX #13183
2020-02-23 23:52:48 +01:00
Laurent Destailleur
ca39c680c7
Rename field documentpdf into printable (this field already exists due
...
to a very old PR nofinished for same goal).
2020-02-23 23:03:17 +01:00
ATM john
fe4e00b139
Add new params to extrafields forms to allow extrafields to be displayed on pdf documents
2020-02-23 11:32:38 +01:00
ATM john
4117aa56a2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-22 11:19:49 +01:00
Laurent Destailleur
7909055ee8
Enhance multilangue support in website module
2020-02-21 11:36:16 +01:00
Laurent Destailleur
c14daa2790
Can set main language and sublanguages of a website
2020-02-19 18:32:04 +01:00
John Botella
6acf10c0d4
extend retained warranty to be available for all invoices
2020-02-19 11:54:55 +01:00
Laurent Destailleur
88b104bc2f
Merge pull request #13121 from aspangaro/12.0_a14
...
NEW: Donation - Update FR CERFA to 11580*04
2020-02-18 23:48:08 +01:00
Alexandre SPANGARO
76a369d351
NEW: Donation - Update FR CERFA to 11580*04
2020-02-17 07:43:24 +01:00
Laurent Destailleur
3792b8c8c8
Fix quote pb reported by travis CI
2020-02-10 15:34:57 +01:00
Laurent Destailleur
9aaed92b49
Fix quotes
2020-02-10 15:33:59 +01:00
Laurent Destailleur
9797fab012
Merge pull request #13069 from aspangaro/12.0_a11
...
NEW : Add French farm chart of accounts 2014
2020-02-10 15:32:59 +01:00
Alexandre SPANGARO
45711bb43c
typo
2020-02-10 05:39:49 +01:00
Alexandre SPANGARO
2f2a2aa52a
NEW : Add French farm chart of accounts 2014
2020-02-10 05:35:16 +01:00
Laurent Destailleur
058524ff82
Comment
2020-02-10 02:29:09 +01:00
Laurent Destailleur
59e0ab9e04
Fix AT-BASE
2020-02-08 17:08:45 +01:00
Norbert Penel
c29a7527ad
accounting austrian
2020-02-08 10:19:38 +01:00
Laurent Destailleur
9f9002d6a6
Update field definition
2020-02-07 16:05:04 +01:00
Laurent Destailleur
f114ca9479
Missing column import_key on ticket table
2020-02-07 15:53:50 +01:00
Laurent Destailleur
fe7b79c83c
Fix definition of objects
2020-02-07 15:51:14 +01:00
Laurent Destailleur
9fdef6858b
Remove code using a no more used field
2020-02-07 13:37:37 +01:00
Laurent Destailleur
4e4fd4c76c
Remove code using a no more used field
2020-02-07 13:15:51 +01:00
Laurent Destailleur
cd58822d98
Can edit a table of resolution code for tickets
2020-02-07 12:48:41 +01:00
Laurent Destailleur
db43b2d3dd
Fix unique key on llx_holiday_users
2020-02-05 13:53:35 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
Laurent Destailleur
fc47fa5ec3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/element.php
2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-03 02:52:46 +01:00
Laurent Destailleur
69a0a1410e
FIX #12991
2020-02-03 02:28:23 +01:00
Laurent Destailleur
a0e3c5292f
FIX #12992
2020-02-03 02:20:38 +01:00
Laurent Destailleur
047ca32229
Merge pull request #12998 from aspangaro/12.0_a8
...
NEW : Add French foundation chart of accounts 2018
2020-02-02 20:25:47 +01:00
Alexandre SPANGARO
f741c9cd42
NEW : Add French association chart of accounts 2018
2020-02-02 15:05:43 +01:00
Alexandre SPANGARO
91b4f7c663
Merge branch 'develop' into 12.0_a8
2020-02-02 14:44:50 +01:00
Alexandre SPANGARO
4c2c2461f9
NEW : Add French association chart of accounts 2018
2020-02-02 14:43:46 +01:00
Laurent Destailleur
d827e3289a
Removed no more used field "amount" in llx_facture
2020-01-31 15:12:17 +01:00
Laurent Destailleur
d0c37a3c61
css
2020-01-30 12:24:04 +01:00
Laurent Destailleur
7b10c2440b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:42 +01:00
Laurent Destailleur
0a221f66ea
Update template
2020-01-29 20:38:46 +01:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
24eb584d50
Doc
2020-01-28 11:04:41 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
6744fc4279
Fix takepos permissions
2020-01-27 00:38:28 +01:00
Laurent Destailleur
f22ad9a9bf
Add column eec in table of countries
2020-01-22 00:36:04 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc
FIX field 'private' on email templates was not managed.
2020-01-20 18:38:53 +01:00
Laurent Destailleur
60fd1f5156
Fix bad entry in menu
2020-01-20 12:47:49 +01:00
Alexandre SPANGARO
282dc0177f
NEW : Add French association chart of accounts 2018
2020-01-20 09:45:07 +01:00
Laurent Destailleur
206cfcd7fe
Clean code for inventory
2020-01-20 02:07:47 +01:00
Laurent Destailleur
e679e05f57
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:04 +01:00
Laurent Destailleur
e803e06c0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/commande/class/commande.class.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
00cddc39fd
Fix remove some orphelins in llx_ecm_files
2020-01-19 13:56:16 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
b48c9a5998
Update website templates
2020-01-17 14:09:29 +01:00
Alexandre SPANGARO
5cf26ad9db
Fix Belgian legal form
2020-01-16 04:31:35 +01:00
Laurent Destailleur
8f73bce878
Add warning if zip lib missing
2020-01-16 01:11:39 +01:00
Laurent Destailleur
e8fbf45807
Fix v12
2020-01-16 00:03:30 +01:00
Laurent Destailleur
2b9dc44980
Missing tables
2020-01-16 00:03:17 +01:00
Alexandre SPANGARO
a198ca5c43
Merge branch 'develop' into 12.0_a1
2020-01-15 17:00:02 +01:00
Alexandre SPANGARO
3577643a16
Merge branch 'develop' into 12.0_a1
2020-01-15 16:57:54 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
64564e75ae
Add entity into unique key
2020-01-15 13:55:17 +01:00
Laurent Destailleur
ef540c6c72
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
2020-01-15 13:50:03 +01:00
Laurent Destailleur
5772dce460
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
atm-ph
a088c78279
Fix column type to be as llx_facture
2020-01-15 09:52:12 +01:00
Laurent Destailleur
22b6828e09
Merge pull request #12792 from aspangaro/12.0_a5
...
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
2020-01-10 00:23:54 +01:00
Laurent Destailleur
e8e82ca08c
Standardize columns
2020-01-09 20:11:03 +01:00
Laurent Destailleur
124f41f863
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 09:10:11 +01:00
Laurent Destailleur
d0739af8b4
Debug MRP
2020-01-08 19:04:00 +01:00
Laurent Destailleur
2eb2feff04
More complete repair
2020-01-08 14:16:05 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
20c9035837
Debug MRP
2020-01-07 22:17:40 +01:00
Laurent Destailleur
b9e0f8999f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Frédéric FRANCE
5b1e3908ca
move migration from 10-11 to 11-12
2020-01-04 10:19:54 +01:00
Alexandre SPANGARO
c3518426bd
NEW Accountancy - Add possibility to manage an short alternative label - use to simplify
2020-01-03 22:05:49 +01:00
Laurent Destailleur
68d7195964
MRP
2020-01-02 22:09:08 +01:00
Laurent Destailleur
d93de4b931
FIX Import of customer prices per segment was not possible
2020-01-02 20:08:43 +01:00
Laurent Destailleur
afd32135f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
2ac6a8a3db
Fix ping after update
2020-01-01 14:30:16 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
Alexandre SPANGARO
1f282ad0e4
Merge branch 'develop' into 12.0_a1
2019-12-31 06:48:04 +01:00
Laurent Destailleur
8838dc38db
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
2019-12-30 22:25:06 +01:00
Laurent Destailleur
ece8390277
Add tables to store translation of all objects (like llx_product_lang)
2019-12-26 13:23:18 +01:00
Laurent Destailleur
4333cf2040
Show the stripe accoutn of a cu_ and a card_
2019-12-24 12:53:10 +01:00
Florian Mortgat
cbca0f389a
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
2019-12-24 10:00:20 +01:00
Florian Mortgat
7359c4140d
FIX 12.0 - bookmark URLs get truncated to 255 chars - PR rescheduled for merging into the next major version (v12.0)
2019-12-24 09:54:02 +01:00
Alexandre SPANGARO
6b55b600f1
Merge remote-tracking branch 'upstream/develop' into 12.0_a1
2019-12-23 21:31:52 +01:00
Laurent Destailleur
f09aecbdd8
v12
2019-12-23 14:28:55 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
Laurent Destailleur
eb32e98127
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-23 14:01:44 +01:00
Laurent Destailleur
36e6036e9e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-23 14:01:00 +01:00
Laurent Destailleur
a076c3c20c
Add mig file for v12
2019-12-23 13:48:38 +01:00
Laurent Destailleur
22f3b69666
Fix default value for situation invoice
2019-12-22 11:59:38 +01:00
Laurent Destailleur
e2451bcd26
Update images
...
Fix value of delay for warning on project not closed
2019-12-21 17:11:21 +01:00
Laurent Destailleur
c0ef3b46ad
Work on MRP module
2019-12-20 15:31:05 +01:00
Laurent Destailleur
7e526f4f41
Fix repair.php removed tabs when it should not
2019-12-19 12:28:50 +01:00
Laurent Destailleur
fb02582de0
Fix clean of constant _TABS_ was forgotten
2019-12-19 12:06:31 +01:00
Laurent Destailleur
d1fdd11b37
Close #10907
2019-12-19 11:32:10 +01:00
ptibogxiv
6789b7bd1e
Fix day scale unit
2019-12-18 18:23:31 +01:00
Laurent Destailleur
451b32674e
Removed duplicate record
2019-12-18 12:15:34 +01:00
Laurent Destailleur
4a734e53a6
Fix column too low.
...
Fix automatic event not found if from a module with several objects
2019-12-17 14:47:58 +01:00
Francis Appels
95b56f0518
Update 6.0.0-7.0.0.sql
...
timestamp NOT NULL can cause SQL error.
2019-12-17 12:19:35 +01:00
Laurent Destailleur
cb71d5a7bb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-15 17:18:21 +01:00
Laurent Destailleur
0ef3de98c6
Try to fix conflict of several stripe accounts
2019-12-15 17:18:09 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
5d955fa7e0
Update 10.0.0-11.0.0.sql
2019-12-14 13:51:13 +01:00
Laurent Destailleur
7d39554797
FIX Bad type of sql fields
2019-12-13 17:16:21 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Florian Mortgat
b715ecd7d9
FIX bookmark URLs get truncated to 255 chars
2019-12-11 16:42:03 +01:00
Laurent Destailleur
df7a86dd42
Merge pull request #12652 from frederic34/doxygen_societe
...
doxygen societe class
2019-12-09 13:02:49 +01:00
Laurent Destailleur
2b5866aca2
WIP Complete module MRP
2019-12-08 23:45:06 +01:00
Frédéric FRANCE
48564ea760
doxygen societe class
2019-12-08 14:26:59 +01:00
Laurent Destailleur
3030a9fa2a
Fix manifest file was saved but not enabled.
2019-12-07 13:09:55 +01:00
Laurent Destailleur
18464de297
Clean old file
2019-12-04 22:08:32 +01:00
Laurent Destailleur
89dd74c115
Fix clean old files
2019-12-04 22:05:09 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Laurent Destailleur
b678100c8d
Update website temp
2019-12-02 09:19:20 +01:00
Maxime Kohlhaas
83928b4708
Fix duration must be double(24,8) to store seconds
2019-12-01 18:19:22 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Laurent Destailleur
1c58cc5031
Clean doc
2019-11-30 10:59:47 +01:00
Laurent Destailleur
0083a3aa28
Update website templates
2019-11-28 13:04:44 +01:00
Laurent Destailleur
37a9c2e9ba
Look and feel v11
2019-11-28 12:40:53 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Laurent Destailleur
b440f2b1f4
Fix a ref is not null
2019-11-26 08:53:54 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Laurent Destailleur
6191307865
Debug v11
2019-11-22 12:22:27 +01:00
Laurent Destailleur
11be3b53f3
Fix migration
2019-11-21 18:39:51 +01:00
Laurent Destailleur
e8bc8b68c1
Fix missing field in migration
2019-11-21 18:17:40 +01:00
Laurent Destailleur
f7319aeefb
Fix size of field
2019-11-20 18:50:03 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
5d7a1f1265
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Laurent Destailleur
74c85b742e
Fix ref must be null until the generation of ref is ok
2019-11-18 18:09:12 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f
Debug email collector. Missing unique key. Fix initial setup.
2019-11-18 11:55:22 +01:00
Laurent Destailleur
502626156e
Work on MRP module
2019-11-17 01:23:19 +01:00
Laurent Destailleur
7a4647b3fb
Merge pull request #12458 from frederic34/doxygen_accountancy
...
doxygen accountancy class
2019-11-16 23:31:56 +01:00
Laurent Destailleur
6dcd1f6275
Fix css
2019-11-16 13:50:12 +01:00
Frédéric FRANCE
5c0976a778
doxygen accountancy class
2019-11-16 09:58:14 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
8ef9728470
Fix permission on file
2019-11-14 17:28:23 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Alexandre SPANGARO
1a9c430e00
Add migration
2019-11-14 04:53:13 +01:00
Frédéric FRANCE
9dcf53c65e
add tables
2019-11-13 20:56:36 +01:00
Laurent Destailleur
88d2658625
Merge branch 'develop' into scrutinizer-patch-2
2019-11-13 19:14:50 +01:00
Frédéric FRANCE
05ab4f79ef
categories for actioncomm
2019-11-13 18:44:11 +01:00
Laurent Destailleur
43ac3dc9e8
Merge pull request #12416 from frederic34/patch-6
...
Update llx_c_action_trigger.sql
2019-11-13 18:41:24 +01:00
Scrutinizer Auto-Fixer
87585c0f2a
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
Laurent Destailleur
56c2dc2614
Reduce need of translations
2019-11-12 22:29:36 +01:00
Frédéric FRANCE
4f90fe0fd2
Update 10.0.0-11.0.0.sql
2019-11-12 21:34:45 +01:00
Frédéric FRANCE
422d893ecc
Update llx_c_action_trigger.sql
2019-11-12 21:33:42 +01:00
Laurent Destailleur
1153b81e6f
Update templates
2019-11-12 16:08:03 +01:00
Alexandre SPANGARO
812c032754
NEW French new regions
2019-11-12 15:56:11 +01:00
Laurent Destailleur
2c718af26c
Missing container type 'menu'
...
Fix: Add security if container is not a page
2019-11-12 13:55:46 +01:00
Laurent Destailleur
3054177e79
Fix type of tickets
2019-11-10 12:28:30 +01:00
Laurent Destailleur
880ecda098
Fix name of tables
2019-11-10 12:23:21 +01:00
Laurent Destailleur
eb378b45a4
Work on BOM - MO module
2019-11-09 20:35:45 +01:00
Laurent Destailleur
59d83fce59
Debug MRP module
2019-11-09 19:57:38 +01:00
Laurent Destailleur
a901ce932d
Repair
2019-11-07 14:19:52 +01:00
Laurent Destailleur
56c20b1d2b
Merge pull request #12350 from frederic34/patch-14
...
missing table product_fournisseur_price_extrafields
2019-11-07 11:30:51 +01:00
Laurent Destailleur
1ea8fed9c4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-07 11:16:20 +01:00
Laurent Destailleur
feef992d39
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-07 11:16:09 +01:00
Laurent Destailleur
887c1a70d9
Fix remove annoying files
2019-11-06 18:46:04 +01:00
Frédéric FRANCE
f292b1f244
missing table product_fournisseur_price_extrafields
...
@Tim-Otte
2019-11-05 22:25:30 +01:00
Frédéric FRANCE
bbf962842e
add icons
2019-11-05 21:09:11 +01:00
Laurent Destailleur
7c4942b7be
Fix debug BOM/MO
2019-11-05 20:14:33 +01:00
Laurent Destailleur
1042cbd989
Fix duplicate ...
2019-11-05 17:20:44 +01:00
Laurent Destailleur
1b701f162a
FIX #12307
2019-11-05 13:16:39 +01:00
Laurent Destailleur
b4d72e3e96
Fix link to setup of social network module
2019-11-05 10:00:46 +01:00
Frédéric FRANCE
7ecdfa7c96
oups
2019-11-03 22:51:42 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Laurent Destailleur
ec9ce1721b
Last recent versions of migration at top
2019-11-02 17:18:34 +01:00
Laurent Destailleur
c63db01d5f
Merge branch 'develop' into patch-234
2019-11-02 16:20:24 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop
...
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
935a7cffa1
Merge pull request #12236 from wdammak/patch-43
...
Remove limit time for upgrade
2019-11-02 13:45:39 +01:00
Laurent Destailleur
a971943832
Update upgrade2.php
2019-11-02 13:45:27 +01:00
stickler-ci
01d8c3bffd
Fixing style errors.
2019-11-02 12:20:32 +00:00
wdammak
378d0b0781
Update upgrade2.php
2019-11-02 13:18:48 +01:00
Laurent Destailleur
906f30773d
Merge pull request #12269 from atm-ph/new_edit_comment
...
New update comments is now available
2019-11-02 13:09:21 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +01:00
Laurent Destailleur
036c1410c7
NEW Save user of last modification in donation record
2019-10-31 23:17:08 +01:00
Laurent Destailleur
716c2bb531
Work on MO
2019-10-31 22:46:34 +01:00
Laurent Destailleur
b296f62671
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-10-31 02:36:31 +01:00
Laurent Destailleur
645390c990
Work on BOM templates
2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
atm-ph
2f68a73a2a
New update comments is now available
2019-10-30 15:45:04 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
...
clean indent
2019-10-30 02:57:59 +01:00
Frédéric FRANCE
dd5a9f4753
clean
2019-10-27 17:56:49 +01:00
Frédéric FRANCE
08f182fe98
Update llx_mrp_mo.key.sql
2019-10-27 17:49:41 +01:00
Frédéric FRANCE
0052349a6a
Update 10.0.0-11.0.0.sql
2019-10-27 17:48:11 +01:00
Frédéric FRANCE
e271aa6318
Update 10.0.0-11.0.0.sql
2019-10-27 17:41:40 +01:00
Frédéric FRANCE
136762dfcd
Update 10.0.0-11.0.0.sql
2019-10-27 17:24:36 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-27 17:03:50 +01:00
Laurent Destailleur
7f1b67f0e4
Add warehouse for production on MO
2019-10-27 16:28:03 +01:00
Frédéric FRANCE
ac6da28135
fix
2019-10-27 10:19:36 +01:00
Frédéric FRANCE
b2b057e9b5
clean indent
2019-10-27 09:51:15 +01:00
Laurent Destailleur
83a5cfbd1c
Support events on BOM
2019-10-27 02:05:43 +02:00
Laurent Destailleur
eb112d4012
Add qty frozen and disable stock change flag on BOM
2019-10-27 01:49:31 +02:00
Laurent Destailleur
8a22dcdbcb
Add sql for MO
2019-10-26 22:49:16 +02:00
wdammak
1a133bffa2
Remove limit time for upgrade
...
remove set_time_limit
2019-10-26 19:54:02 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
1cd1152290
Merge pull request #12193 from dolibarr95/patch-56
...
NEW: package sql data
2019-10-22 19:25:32 +02:00
dolibarr95
af8f5948f0
Package tables
...
llx_expedition_package and llx_c_shipment_package_type
2019-10-22 13:54:50 +02:00
ptibogxiv
c3fac0b8c9
Update llx_adherent_type.sql
2019-10-22 12:52:41 +02:00
ptibogxiv
d77215c40e
Update llx_adherent_type.sql
2019-10-22 12:52:14 +02:00
Laurent Destailleur
8aacfcdfbd
Merge branch 'develop' into patch-234
2019-10-22 12:46:39 +02:00
Laurent Destailleur
1ba9c31b37
Add migration of index
2019-10-22 12:34:03 +02:00
Laurent Léonard
b5aab50194
Add index on fk_origin_line column of llx_expeditiondet table
2019-10-22 06:07:11 +02:00
dolibarr95
c235740544
parcel to package
2019-10-21 08:58:13 +02:00
dolibarr95
16bd837dc7
create file
...
Dictionary of package type
2019-10-21 08:54:59 +02:00
dolibarr95
6a55aedf59
Create file.
...
List of parcels details related to an expedition.
2019-10-21 08:46:07 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37:18 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
2d017a6c80
Fix migration
2019-10-17 20:09:24 +02:00
Laurent Destailleur
005b1b12c4
Work on sort of permission per family+module
2019-10-17 19:33:06 +02:00
Laurent Destailleur
87ec1de78e
Start to work on solution to sort permissions by module
2019-10-17 18:43:07 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
e94d47daf7
Work on MRP module
2019-10-15 19:57:23 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Laurent Destailleur
7973b03201
NEW Add estimated duration on the BOM module
2019-10-14 11:38:36 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 19:02:24 +02:00
Laurent Destailleur
dfaf2ae34b
Trans
2019-10-11 19:20:52 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-11 16:44:25 +02:00
Laurent Destailleur
de107fb02e
NEW Can set a squarred icon on your company setup
2019-10-11 11:27:05 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Laurent Destailleur
28b87f9e27
Add image for members
2019-10-10 10:35:18 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-09 13:40:46 +02:00
Laurent Destailleur
29384d9a71
Merge branch 'develop' into patch-187
2019-10-09 13:02:47 +02:00
Laurent Destailleur
a8fbefed8c
Update 10.0.0-11.0.0.sql
2019-10-08 19:42:40 +02:00
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255
2019-10-08 19:37:42 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
ptibogxiv
17198d59c2
Update 10.0.0-11.0.0.sql
2019-10-08 16:17:31 +02:00
ptibogxiv
552a9498be
Update llx_product.sql
2019-10-08 16:11:50 +02:00
Laurent Destailleur
d55b7689bb
Merge pull request #11920 from ptibogxiv/patch-264
...
NEW translation for member type
2019-10-08 09:00:49 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault
...
NEW : Address/Contact by default on third parties
2019-10-07 15:27:58 +02:00
Laurent Destailleur
e02794248e
Merge branch 'develop' into patch-264
2019-10-07 13:25:16 +02:00
Frédéric FRANCE
f80fa08a2d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-07 07:57:05 +02:00
Laurent Destailleur
d4bb6490e9
Fix migration
2019-10-06 16:25:22 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
florian HENRY
2d3dd9ed3c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-10-04 18:10:16 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 18:37:14 +02:00
Frédéric FRANCE
91761e8185
fix migration script for thirdparties
2019-10-02 21:16:33 +02:00
Frédéric FRANCE
fe4629cd87
new migration script for thirdparties
2019-10-02 21:11:21 +02:00
Frédéric FRANCE
634fc5727c
new migration script for contacts
2019-10-02 21:08:41 +02:00
Frédéric FRANCE
b96911e9b7
new migration script for members
2019-10-02 21:05:19 +02:00
Frédéric FRANCE
cc03a0a63f
new migration script for user
2019-10-02 20:53:47 +02:00
Frédéric FRANCE
edf559697a
restore unfinished old commit
2019-10-01 23:47:45 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
Frédéric FRANCE
010b2723b6
work on migration script
2019-10-01 20:14:06 +02:00
Frédéric FRANCE
2ac908ffcf
work on migration script
2019-10-01 19:59:49 +02:00
florian HENRY
d48f0fa791
resolve conflixt
2019-10-01 18:07:59 +02:00
Frédéric FRANCE
9755d15f52
work on migration script
2019-10-01 17:51:44 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 12:25:34 +02:00
Laurent Destailleur
956b46d920
Fix warnings
2019-10-01 11:37:15 +02:00
Frédéric FRANCE
6a7170f725
Merge remote-tracking branch 'upstream/develop' into phpcalendar
2019-10-01 07:55:09 +02:00
Frédéric FRANCE
c57c8eee88
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 07:41:10 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Laurent Destailleur
91b7e81085
Fix warnings
2019-09-30 21:51:42 +02:00
Frédéric FRANCE
31418c2e42
check php-calendar extension
2019-09-30 21:14:25 +02:00
Laurent Destailleur
3ca1a9ba28
Merge branch 'test_pgsql_installation' of https://github.com/atm-greg/dolibarr into atm-greg-test_pgsql_installation
2019-09-30 19:59:52 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-30 19:34:35 +02:00
Laurent Destailleur
22f07fe54d
Merge branch 'develop' into patch-234
2019-09-30 18:09:05 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 07:49:52 +02:00
ptibogxiv
f132f2f947
Update 10.0.0-11.0.0.sql
2019-09-29 15:40:26 +02:00
ptibogxiv
d0b06a1eab
Update llx_facture.sql
2019-09-29 15:39:59 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +02:00
florian HENRY
885d958e63
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-27 20:12:09 +02:00
Laurent Destailleur
d0d884742f
FIX #11861 Not consistent code to manage measuring units
2019-09-27 19:45:33 +02:00
Laurent Destailleur
07b555b965
Merge branch 'develop' into patch-255
2019-09-27 15:23:15 +02:00
Laurent Destailleur
f5c839217a
Merge pull request #11914 from fmarcet/develop
...
Fix: Load invoices only if showed
2019-09-27 14:34:16 +02:00
Laurent Destailleur
6858dce344
Rename table for categorie of warehouses
2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories
...
NEW Categories/Tags are also available on warehouses
2019-09-27 12:41:28 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Frédéric FRANCE
5eb0fb462b
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-27 07:59:02 +02:00
Laurent Destailleur
72f9073337
Clean vat code samples to have cleaner rules for rowid.
2019-09-26 12:44:44 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-25 08:06:44 +02:00
Laurent Destailleur
19c78d42e9
Fix az09 -> aZ09
2019-09-24 14:20:29 +02:00
Laurent Destailleur
db334a3b94
FIX Var not enough sanitized
2019-09-24 14:16:24 +02:00
Ferran Marcet
a8cc11d232
Merge branch 'developup' into develop
2019-09-24 13:38:11 +02:00
Laurent Destailleur
7b3e64d67f
NEW Support of Extrafields on Leave requests.
2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent Destailleur
64fc735340
Fix length of fields to card saved with setupintent
2019-09-23 18:12:58 +02:00
Laurent Destailleur
1584a4bf79
Add trigger event USER_SENTBYMAIL in agenda
2019-09-23 12:27:51 +02:00
atm-quentin
c09f2d8c4e
NEW stock categories
2019-09-19 16:21:03 +02:00
Frédéric FRANCE
61e358bb9d
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-18 21:23:26 +02:00
Laurent Destailleur
a43253eab8
Fix for deposit not correctly closed
2019-09-17 18:49:56 +02:00
ptibogxiv
b969de46bc
Update 10.0.0-11.0.0.sql
2019-09-17 14:05:39 +02:00
ptibogxiv
4c59f6bffa
Update llx_adherent_type_lang.sql
2019-09-17 14:03:55 +02:00
ptibogxiv
430ffae8ad
Delete llx_adherent_type_lang.php
2019-09-17 14:03:22 +02:00
ptibogxiv
afb055c8a6
Create llx_adherent_type_lang.sql
2019-09-17 14:03:09 +02:00
ptibogxiv
50be1a634c
Create llx_adherent_type_lang.php
2019-09-17 14:02:19 +02:00
Ferran Marcet
e4984492b3
Dejarlo igual que develop
2019-09-17 09:32:43 +02:00
Ferran Marcet
c48fc3a2cf
Merge branch 'developup' into develop
...
# Conflicts:
# htdocs/compta/facture/fiche-rec.php
# htdocs/install/mysql/migration/9.0.0-10.0.0.sql
2019-09-17 09:27:42 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-17 08:24:31 +02:00
Maxime Kohlhaas
48cbcdc757
Fix #11876
2019-09-15 17:08:21 +02:00
Frédéric FRANCE
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 18:42:31 +02:00
Frédéric FRANCE
1e652a41af
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 18:41:51 +02:00
Laurent Destailleur
54f0532073
Work on #4432
2019-09-14 16:51:57 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 16:37:10 +02:00
Frédéric FRANCE
230c14e189
add social networks
2019-09-12 22:32:41 +02:00
Frédéric FRANCE
de3a67f5bd
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-12 21:52:06 +02:00
Frédéric FRANCE
bed959bb38
add entity
2019-09-12 21:17:52 +02:00
Frédéric FRANCE
6f33874d75
add entity
2019-09-12 21:13:00 +02:00
Laurent Destailleur
56a99f6e6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-12 11:22:13 +02:00
Frédéric FRANCE
3e11476810
add socialnetworks dictionary
2019-09-11 23:09:20 +02:00
Frédéric FRANCE
e0f17cc71c
add socialnetworks dictionary
2019-09-11 22:47:23 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
Laurent Destailleur
eeaeefe20c
FIX Add repair.php option 'restore' to restore user picture after v10
2019-09-11 15:46:37 +02:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187
2019-09-10 20:46:54 +02:00
florian HENRY
d081a73dca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-10 08:36:54 +02:00
Laurent Destailleur
61cf47aa16
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-10 00:14:07 +02:00
florian HENRY
617e430998
fix stravis and sticker
2019-09-09 12:31:17 +02:00
florian HENRY
63a83a0fa5
resolve conflict
2019-09-09 11:35:37 +02:00
Laurent Destailleur
8381b93e80
Fix init of public holidays
2019-09-09 11:06:54 +02:00
Laurent Destailleur
15eaa5cbd8
NEW Public holidays are now in a table (no more hard coded per country)
2019-09-09 10:27:56 +02:00
florian HENRY
bdb297a380
resolve conflict
2019-09-09 10:15:44 +02:00
Laurent Destailleur
47f72fb74c
Update data file
2019-09-08 21:21:58 +02:00
Frédéric FRANCE
4054ebaf27
wip
2019-09-07 15:12:07 +02:00
Laurent Destailleur
bdbae9b3bc
Fix phpcs
2019-09-06 23:51:33 +02:00
Laurent Destailleur
ca71f02d41
Merge branch 'develop' into develop_pdf
2019-09-06 23:30:12 +02:00
Laurent Destailleur
a5f7211730
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
e1ee70fd8f
Start to implement date selection of supplier proposals
2019-09-06 12:45:27 +02:00
ptibogxiv
ead8d29ed3
Update 10.0.0-11.0.0.sql
2019-09-06 11:32:46 +02:00
ptibogxiv
e55c7bc378
Update llx_facture.sql
2019-09-06 11:22:22 +02:00
florian HENRY
dff7be59c8
mostlyDone
2019-09-06 09:22:53 +02:00
Laurent Destailleur
37a32af7b0
NEW Add dictionary to store public holidays.
2019-09-05 20:19:13 +02:00
Regis Houssin
ecaa2df0b8
FIX change "rowid" type in llx_accounting_account (bigint instead int)
2019-09-05 10:37:09 +02:00
Laurent Destailleur
7aaf3ac629
Typo
2019-09-04 15:41:09 +02:00
Tim Otte
54d0b94b6d
Added extrafield support to the product supplier price lines
2019-09-04 15:13:42 +02:00
florian HENRY
73c5b9617f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-03 17:07:59 +02:00
Laurent Destailleur
c4a4efe0dc
Merge pull request #11769 from Tim-Otte/develop
...
NEW: Added odt support to supplier orders
2019-09-03 13:04:33 +02:00
florian HENRY
405c92640c
on going
2019-09-02 14:47:32 +02:00
florian HENRY
b535bc0cb9
start dev
2019-09-02 11:27:04 +02:00
Laurent Destailleur
04057cd83e
Prepare reengeneering of project usage
2019-09-01 02:02:38 +02:00
Laurent Destailleur
8366d89b41
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/10.0.0-11.0.0.sql
2019-08-28 18:15:22 +02:00
Laurent Destailleur
d668b79738
NEW Add column tms into the table of targets for emailing
2019-08-28 18:14:46 +02:00
Laurent Destailleur
27b61eca32
NEW Add column tms into the table of targets for emailing
2019-08-28 18:12:02 +02:00
Tim Otte
5abfc04900
Merge branch 'develop' into develop
2019-08-27 16:37:41 +02:00
Tim Otte
75152cb210
Added odt support to supplier orders
2019-08-27 16:22:16 +02:00
Laurent Destailleur
69688a22e0
Merge
2019-08-27 12:33:42 +02:00
Laurent Destailleur
c2c9e1d042
Fix warning
2019-08-27 12:15:29 +02:00
Laurent Destailleur
047298cded
Merge pull request #11511 from atm-florianm/9.0_FIX_dispatched-products-array-bug
...
9.0 fix dispatched products array bug
2019-08-26 23:58:40 +02:00
Laurent Destailleur
1463302bdd
Add option to disable the anonymous ping
2019-08-23 16:23:31 +02:00
Laurent Destailleur
bc269462a7
FIX Do not autocomplete pass on first installation.
2019-08-23 15:30:48 +02:00
ptibogxiv
01f0a6a19f
Update llx_adherent_type.sql
2019-08-23 14:56:59 +02:00
ptibogxiv
b8fce830f7
Update llx_adherent_type.sql
2019-08-23 14:56:38 +02:00
ptibogxiv
60a7ba463c
Update 10.0.0-11.0.0.sql
2019-08-23 14:53:40 +02:00
Florian Mortgat
fa29415e6a
Moved repair payload from a specific script to install/repair.php
2019-08-22 14:06:18 +02:00
ptibogxiv
e43d996780
Update 10.0.0-11.0.0.sql
2019-08-21 16:45:53 +02:00
ptibogxiv
869e497a48
NEW : Platforme compliance with Stripe Connect
2019-08-21 16:41:36 +02:00
Laurent Destailleur
23b1c24bf7
Fix template
2019-08-16 06:28:25 +02:00
Laurent Destailleur
5d1bfdaa29
Merge pull request #11678 from atm-greg/develop_fk_projet_on_stock_movement
...
NEW Add fk projet on stock movement
2019-08-15 19:27:06 +02:00
Laurent Destailleur
14030affe5
Update website templates
2019-08-15 02:57:00 +02:00
Laurent Destailleur
bb35d9be0c
Fix copy of templates during activation of module
2019-08-15 01:50:01 +02:00
Laurent Destailleur
f81463af0c
Update templates
2019-08-15 00:55:47 +02:00
Laurent Destailleur
dfe2c3de74
Add template stellar
2019-08-15 00:31:37 +02:00
Laurent Destailleur
f753799810
FIX Support #tag into url of website module
2019-08-14 23:27:34 +02:00
Laurent Destailleur
bb4618e2cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2019-08-14 04:12:37 +02:00
Laurent Destailleur
77c96a49e1
Update website template
2019-08-13 04:53:47 +02:00
Laurent Destailleur
8ad2081555
NEW Can select website templates from available default templates
2019-08-12 22:19:24 +02:00
atm-greg
7c136e77ec
bad migration file
2019-08-12 15:18:40 +02:00
atm-greg
f8ad8d72c0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement
2019-08-12 15:16:43 +02:00
atm-greg
acdf13d769
add fk_projet on stock movements
2019-08-12 15:08:15 +02:00
Laurent Destailleur
86d39b435b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 02:42:11 +02:00
Laurent Destailleur
5ca988b3d2
Fix position of requests
2019-08-12 02:36:15 +02:00
Frédéric FRANCE
d55377981c
Update 10.0.0-11.0.0.sql
2019-08-07 13:27:55 +02:00
Frédéric FRANCE
28100f67ac
Update llx_c_price_expression.sql
2019-08-07 13:25:14 +02:00
ptibogxiv
f7134340e8
Update llx_product.sql
2019-08-04 13:22:01 +02:00
Laurent Destailleur
f8e19beb5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 18:30:59 +02:00
Laurent Destailleur
808d6ba389
Fix phpcs
2019-08-01 18:30:39 +02:00
Laurent Destailleur
85dbec6ae7
Move sql in correct migration file
2019-08-01 16:33:34 +02:00
Laurent Destailleur
25725a5a6a
Merge pull request #11615 from ptibogxiv/patch-202
...
Fix wrong sql update version retained_warranty
2019-08-01 16:32:00 +02:00
Laurent Destailleur
3d8f6dca76
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:32 +02:00
ptibogxiv
ace01f7442
Fix wrong sql update version
2019-08-01 16:29:42 +02:00
Laurent Destailleur
6693f9fbca
Fix phpcs
2019-08-01 16:24:19 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
...
NEW Management of retained warranty on situation invoices
2019-07-30 21:53:09 +02:00
Laurent Destailleur
34f78c555d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/bookkeeping/list.php
htdocs/adherents/card.php
htdocs/compta/sociales/list.php
htdocs/compta/sociales/payments.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/holiday/class/holiday.class.php
htdocs/viewimage.php
2019-07-30 20:55:15 +02:00
Laurent Destailleur
5f2439bf0a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-30 20:37:44 +02:00
Florian Mortgat
de293c4ef2
FIX issue #9300 : install error with PostgreSQL when using custom table prefix
2019-07-30 14:09:03 +02:00
Laurent Destailleur
9f7d118f6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-27 02:40:56 +02:00
Laurent Destailleur
3a740313fe
Merge branch '10.0' into 10.0
2019-07-25 18:31:26 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
e88ca8ae89
Fix migration
2019-07-25 15:07:24 +02:00
Laurent Destailleur
4833c2bf49
Merge
2019-07-22 18:50:17 +02:00
Laurent Destailleur
f5afc50067
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
2019-07-22 18:47:35 +02:00
Laurent Destailleur
a379d7804c
Merge pull request #11535 from aspangaro/11.0_p1
...
QUAL Move ligne.php to line.php
2019-07-22 18:33:06 +02:00
jcp
cfaf9ce0ea
SET special_code=4 for existing records
2019-07-22 11:44:18 +02:00
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +02:00
Laurent Destailleur
5d1a50bcb4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 14:03:18 +02:00
Laurent Destailleur
ac8a776113
FIX Column 'paid' missing in expense report
2019-07-20 14:02:53 +02:00
Laurent Destailleur
826851e1a9
Fix migration
2019-07-20 14:01:00 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Alexandre SPANGARO
8b8aaafc05
Merge branch 'develop' into 10.0_intracommreport
2019-07-20 05:47:31 +02:00
Alexandre SPANGARO
5f042cf6ad
QUAL Move ligne.php to line.php
2019-07-19 23:19:06 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries
2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
fafb7956de
Fix position of triggers
2019-07-19 18:52:44 +02:00
Laurent Destailleur
a55da8f8f8
Fix migration
2019-07-19 17:20:33 +02:00
Alexandre SPANGARO
21bd46fc15
Merge remote-tracking branch 'upstream/develop' into 11.0_salaries
2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda
NEW Extrafields on salaries
2019-07-17 14:09:25 +02:00
Laurent Destailleur
fed598236c
Add field
2019-07-17 01:12:48 +02:00
Laurent Destailleur
61a574701b
New Add field prefix_session in llx_events
2019-07-17 01:11:10 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
2019-07-14 00:19:56 +02:00
Regis Houssin
332abd2a9f
FIX __INFOS__ tag not exists
2019-07-13 11:02:45 +02:00
Laurent Destailleur
e5d34de877
FIX compatibility mysql 8. rank is reserved
...
FIX Permission for BOM menu
2019-07-09 00:14:01 +02:00
Laurent Destailleur
4387d40b9a
Translation lignes -> lines
2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
Laurent Destailleur
46f590f0be
Add column iplastlogin and ippreviouslogin
2019-07-01 15:44:34 +02:00
Laurent Destailleur
c9477f5c4f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2019-07-01 13:29:33 +02:00
Laurent Destailleur
511b21ca9c
Fix for doliwamp
2019-07-01 00:22:28 +02:00
Laurent Destailleur
46ced373be
Fix for doliwamp
2019-06-30 23:52:28 +02:00
Laurent Destailleur
8f5b575b19
Fix missing php-intl is not blocking (not working on windows)
2019-06-30 16:19:26 +02:00
Alexandre SPANGARO
9da91c06ed
Merge branch 'develop' into 10.0_intracommreport
2019-06-26 15:11:43 +02:00
John Botella
7e14a598e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-26 09:43:43 +02:00
Laurent Destailleur
51a1550dbb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2019-06-25 23:14:49 +02:00
Laurent Destailleur
83f5b23ade
Doc
2019-06-25 22:39:04 +02:00
Laurent Destailleur
85919d8324
Code comment
2019-06-25 22:02:19 +02:00
Laurent Destailleur
33ce52364a
Drop no more used column
2019-06-25 16:08:22 +02:00
Laurent Destailleur
06b3f6a62f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
2019-06-25 13:03:54 +02:00
Laurent Destailleur
b8b0ad0d27
Fix migration
2019-06-25 11:22:35 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Alexandre SPANGARO
4a84dcaa62
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-06-23 21:47:34 +02:00
Laurent Destailleur
c1f6b76a6a
Remove deprecated
2019-06-22 18:29:24 +02:00
Laurent Destailleur
db241b22dd
Fix clean of database
2019-06-22 14:33:31 +02:00
Laurent Destailleur
fdff737329
Fix clean of database
2019-06-22 14:33:04 +02:00
Laurent Destailleur
c089a47b4c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 14:15:30 +02:00
Laurent Destailleur
e6ea9cc448
Clean widget not correctly removed
2019-06-22 14:15:10 +02:00
Laurent Destailleur
22b91f3693
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 13:28:44 +02:00
Laurent Destailleur
64de57d781
FIX bad request
2019-06-22 13:28:20 +02:00
Laurent Destailleur
8da5794777
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Laurent Destailleur
faadae8157
Code comment
2019-06-20 15:59:45 +02:00
Alexandre SPANGARO
69f15db4e9
Fix migration - Move to v11
2019-06-20 09:37:23 +02:00
Alexandre SPANGARO
20b516885f
WIP
2019-06-20 09:33:01 +02:00
Laurent Destailleur
06e5fbd649
Merge pull request #11132 from ptibogxiv/patch-174
...
NEW add API shipment mode dictionnary
2019-06-20 03:56:59 +02:00
Laurent Destailleur
77a45b878b
Fix migration
2019-06-20 03:56:42 +02:00
Laurent Destailleur
40023c8ba2
Merge branch 'develop' into patch-174
2019-06-20 03:56:29 +02:00
Laurent Destailleur
5fe91afdc2
Update 9.0.0-10.0.0.sql
2019-06-20 03:54:50 +02:00
Laurent Destailleur
d8c2007d92
Prepare v11 alpha
2019-06-20 03:53:33 +02:00
Laurent Destailleur
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
...
NEW add extrafields in warehouses
2019-06-20 03:16:49 +02:00
Laurent Destailleur
b4cb440b0f
Merge pull request #11359 from inoveaconseil/FIX_BOM_sql
...
Fix bom sql
2019-06-20 02:58:24 +02:00
Alexandre SPANGARO
abfb708044
Merge branch 'develop' into 10.0_intracommreport
2019-06-19 21:43:40 +02:00
Laurent Destailleur
13abfc3140
Code comment
2019-06-18 16:46:12 +02:00
Laurent Destailleur
1dc247705d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/expensereport/list.php
htdocs/holiday/list.php
2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-18 16:04:48 +02:00
Laurent Destailleur
6afda6a47a
FIX invalid link on user.fk_user
2019-06-18 15:57:22 +02:00
Laurent Destailleur
8835b49f3f
Debug the accounting-file tool
2019-06-18 14:30:13 +02:00
Nicolas ZABOURI
96c6994827
FIX 2 déclarations of date_valid in SQL
2019-06-18 10:55:16 +02:00
Laurent Destailleur
4f03d4f642
Merge branch '10.0' into patch-189
2019-06-16 17:26:41 +02:00
Laurent Destailleur
badfd47ee7
Fix migration
2019-06-16 17:25:42 +02:00
ptibogxiv
d838ced12e
Update 9.0.0-10.0.0.sql
2019-06-14 18:41:38 +02:00
ptibogxiv
cd5c2c3249
Update llx_bom_bom.sql
2019-06-14 18:39:05 +02:00
ptibogxiv
c6ab092af1
add capacity value for product
2019-06-14 09:12:53 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export
2019-06-12 13:27:49 +02:00
Laurent Destailleur
73326cfbf9
Removed bad commited files
2019-06-07 16:56:08 +02:00
Laurent Destailleur
8ef7a3abf2
Clean demofile for v10
2019-06-05 11:56:57 +02:00
Laurent Destailleur
d3d0ce4649
Better error message when missing grant privileges
2019-06-05 10:42:59 +02:00
Laurent Destailleur
a70a14b145
Fix migration
2019-06-04 20:06:44 +02:00
Laurent Destailleur
21a1e0d7b3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
2019-06-04 19:03:27 +02:00
John BOTELLA
d7a393bbd3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-04 14:00:18 +02:00
Laurent Destailleur
664e0b81d8
Debug module BOM
2019-06-03 22:07:34 +02:00
Lionel VESSILLER
439eafb637
NEW add extrafields in warehouses
...
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
2019-06-03 15:44:17 +02:00
Laurent Destailleur
3cda0d2dc5
Fix phpcs
2019-06-02 15:49:10 +02:00
Laurent Destailleur
57cfb4b007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-02 12:30:25 +02:00
Laurent Destailleur
ea58f8a617
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-02 11:49:49 +02:00
Laurent Destailleur
5f0fbcea9a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/contact/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
2019-06-02 11:49:33 +02:00
Maxime Kohlhaas
15fd24a511
Fix : remove hardcoded llx_ prefix
2019-05-31 12:14:51 +02:00
Regis Houssin
063fe35c97
FIX missing encrypt llx_const fields
2019-05-30 11:45:55 +02:00
Regis Houssin
bdd54ae245
FIX missing llx_const encrypt
2019-05-30 11:42:28 +02:00
Laurent Destailleur
ae597e7b63
Merge pull request #11252 from KlaasOl/patch-2
...
Create llx_accounting_account_nl.sql
2019-05-29 12:25:42 +02:00
Laurent Destailleur
8c97fc164f
Merge pull request #11253 from KlaasOl/patch-3
...
Update llx_accounting_abc.sql
2019-05-29 12:25:08 +02:00
Laurent Destailleur
05063016e8
FIX #11244 Enhance repair tool
2019-05-29 12:21:51 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
KlaasOl
4301cd5b7a
Update llx_accounting_abc.sql
...
Adding chart of account NL VERKORT
2019-05-26 15:40:44 +02:00
KlaasOl
f879225032
Create llx_accounting_account_nl.sql
...
First accounting account scheme for Dutch accounting
2019-05-26 15:29:50 +02:00
Laurent Destailleur
b7a3cdd7c6
Debug BOM module
2019-05-26 01:31:54 +02:00
Laurent Destailleur
9f9f3bda63
Debug BOM module
2019-05-26 01:06:19 +02:00
Laurent Destailleur
a5865d3e4a
Debug BOM
2019-05-25 19:29:33 +02:00
Alexandre SPANGARO
d9e9cb2ea9
Merge branch 'develop' into 10.0_Differentiated_export
2019-05-20 15:02:05 +02:00
Alexandre SPANGARO
ba4bd274c0
WIP
2019-05-20 14:52:06 +02:00
Alexandre SPANGARO
e81dcb6060
WIP Update database
2019-05-19 21:26:49 +02:00
florian HENRY
c3dbbe51cf
fix missing migration sql for ticket now stable on 10
2019-05-18 23:57:00 +02:00
Laurent Destailleur
a1ec074d03
Merge pull request #11205 from ATM-Marc/NEW_supplier_proposal_contact_type
...
FIX: add contact types for supplier proposals (Issue #10949 )
2019-05-18 16:56:40 +02:00
ATM-Marc
2c104ccc4a
NEW: contact types for supplier proposals
2019-05-18 14:22:04 +02:00
Laurent Destailleur
9e38f3122d
Update for pgsql
2019-05-18 01:26:44 +02:00
Norbert Penel / OSCSS
13b75e35a0
FIx tms field made with modulebuilder
...
all new module appear to have a bug on tms, no data can be inserted due to tms default value that can't be null
2019-05-18 00:20:44 +02:00
Laurent Destailleur
bd1ed4f7ac
Merge branch 'develop' into 10.0_Differentiated_export
2019-05-16 21:26:20 +02:00
Laurent Destailleur
0d6841dacb
Merge pull request #11176 from aspangaro/10.0_FEC
...
FIX FEC Remove useless field 'validated'
2019-05-16 21:20:20 +02:00
Alexandre SPANGARO
60d00e2f5c
FIX FEC Remove useless field 'validated'
2019-05-14 06:46:06 +02:00
Alexandre SPANGARO
7c9ccee64d
NEW Accountancy - Differentiated export
2019-05-14 05:45:36 +02:00
Laurent Destailleur
7a75567ad9
FIX Debug ticket module
2019-05-12 16:34:49 +02:00
Laurent Destailleur
cdebca14a7
Fix migration
2019-05-09 17:32:13 +02:00
Laurent Destailleur
1c558c685c
Fix class not found
2019-05-09 17:16:35 +02:00
Laurent Destailleur
95bb8a1f75
Update llx_c_shipment_mode.key.sql
2019-05-08 01:57:39 +02:00
Laurent Destailleur
249893a4ab
Update 9.0.0-10.0.0.sql
2019-05-08 01:57:23 +02:00
Laurent Destailleur
53b1dec317
Update 9.0.0-10.0.0.sql
2019-05-08 01:56:52 +02:00
ptibogxiv
e65c8399e6
Update 9.0.0-10.0.0.sql
2019-05-05 19:14:09 +02:00
ptibogxiv
499798b2e0
Update llx_c_shipment_mode.key.sql
2019-05-05 19:11:18 +02:00
ptibogxiv
15cff25bbc
Update llx_c_shipment_mode.sql
2019-05-05 19:10:39 +02:00
ptibogxiv
f0fd0ece60
Update 9.0.0-10.0.0.sql
2019-05-05 15:06:10 +02:00
ptibogxiv
7033243572
FIX url lettre max & colissimo
2019-05-05 15:02:00 +02:00
Laurent Destailleur
3a8d645fb9
Debug module ticket
2019-05-01 20:55:46 +02:00
Ferran Marcet
7a651b5071
New: Add ref_client field on template invoice
2019-04-26 13:53:22 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +02:00
Laurent Destailleur
6884999ee3
Merge pull request #10925 from ptibogxiv/patch-146
...
NEW morphy value in member type
2019-04-25 03:00:25 +02:00
Laurent Destailleur
68d438b697
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/user/class/user.class.php
2019-04-25 01:50:48 +02:00
Laurent Destailleur
becf096bf8
FIX ref for table without ref manager are set to NULL.
2019-04-25 01:37:08 +02:00
Laurent Destailleur
691159c56b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-24 10:24:55 +02:00
Laurent Destailleur
1264857211
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/js/timesheet.js
2019-04-24 10:24:32 +02:00
Laurent Destailleur
8025fb1ac1
Fix size of column
2019-04-24 10:07:58 +02:00
Laurent Destailleur
e0b71fd258
Fix size of column
2019-04-24 10:07:34 +02:00
atm-greg
3231e54abd
fix actioncomm module for long trigger names
2019-04-23 16:19:58 +02:00
Laurent Destailleur
c0c723a207
Work on inventory feature
2019-04-23 11:00:28 +02:00
Laurent Destailleur
9930b276ff
Fix image link
2019-04-22 17:29:02 +02:00
Laurent Destailleur
fae2983c2a
Merge branch 'develop' into new_user_hr_fields
2019-04-11 18:27:58 +02:00
Laurent Destailleur
2eeb4b8734
Debug ticket module
2019-04-10 15:45:55 +02:00
Laurent Destailleur
1f6f6f6edb
Track action close for ticket
2019-04-10 13:21:06 +02:00
Laurent Destailleur
ff629b2355
NEW Color for hover and for checked line is on by default
2019-04-09 15:57:26 +02:00
Laurent Destailleur
65e931cfe2
Work on email collector
2019-04-08 21:22:10 +02:00
Laurent Destailleur
321ffb859b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/perweek.php
2019-04-08 14:09:18 +02:00
Laurent Destailleur
b23f74eab1
FIX Status of opportunity should never be -1
2019-04-08 12:17:57 +02:00
Laurent Destailleur
fad2fa48dd
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
2019-04-07 15:44:17 +02:00
Laurent Destailleur
302a42a603
PHP 5.4 is no more supported. Minimum PHP is now 5.5+.
2019-04-06 13:20:26 +02:00
Laurent Destailleur
9c7464d157
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/list.php
htdocs/societe/card.php
2019-04-04 17:42:12 +02:00
Laurent Destailleur
1ac51b6e06
More complete example to fix migration error from v8
2019-04-04 13:46:01 +02:00
Laurent Destailleur
56f8c42b0a
The PHP extension php-intl is not mandatory but should be installed to
...
have new features working correctly.
2019-04-03 19:37:54 +02:00
Laurent Destailleur
333ba7b549
Save files for website template
2019-04-03 16:28:16 +02:00
ptibogxiv
3723da43ca
Update 9.0.0-10.0.0.sql
2019-03-27 12:50:16 +01:00
ptibogxiv
63ad6b779a
Update llx_adherent_type.sql
2019-03-27 12:49:26 +01:00
Laurent Destailleur
e7dea3cfe7
Merge pull request #10911 from leangjia/develop
...
Add China regions.
2019-03-26 19:23:08 +01:00
Laurent Destailleur
4c4ad0548d
Fix for creation of index composed with type
2019-03-26 17:56:46 +01:00
liAnGjiA
62767fc059
Update llx_10_c_regions.sql
2019-03-25 10:16:41 +08:00
leangjia
a207a699b6
Add China regions.
2019-03-25 00:21:09 +08:00
Laurent Destailleur
8ca5b2e45f
Rename field
2019-03-22 17:43:53 +01:00
Laurent Destailleur
d8e3624d65
Merge pull request #10851 from wdammak/patch-37
...
Add fk_project to product table
2019-03-21 18:32:49 +01:00
Laurent Destailleur
ae2f76f6bd
Update llx_product.sql
2019-03-21 18:32:40 +01:00
Laurent Destailleur
52b91499ba
Update 9.0.0-10.0.0.sql
2019-03-21 18:31:13 +01:00
atm-greg
d809c017ca
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into test_pgsql_installation
2019-03-20 06:10:53 +01:00
Laurent Destailleur
9a3c66b057
Merge pull request #10846 from grandoc/new_branch_15_03_2019
...
New branch 15 03 2019
2019-03-19 12:13:02 +01:00
Laurent Destailleur
1a8902f23e
Fix migration for compatibility
2019-03-19 12:03:02 +01:00
Laurent Destailleur
6970d066f8
Better compatibility
2019-03-19 11:23:38 +01:00
Laurent Destailleur
a4372e24bf
Migration
2019-03-19 11:21:55 +01:00
Laurent Destailleur
77b675bec1
Merge pull request #10876 from ptibogxiv/patch-143
...
FIX support duration/time units with services
2019-03-19 11:20:13 +01:00
Laurent Destailleur
81fb18befe
Complete unit table
2019-03-19 11:19:46 +01:00
wdammak
56bee8a20f
Update llx_product.key.sql
2019-03-18 20:23:45 +01:00
wdammak
cf0bc88601
Update llx_product.sql
2019-03-18 20:19:30 +01:00
ptibogxiv
eb196ba8e6
Update 9.0.0-10.0.0.sql
2019-03-18 14:25:13 +01:00
ptibogxiv
9178939fe6
ADD week, month, year
2019-03-18 14:21:36 +01:00
ptibogxiv
030048db28
FIX compatibility of minute with php unit value
2019-03-18 14:07:31 +01:00
atm-ph
466a5e2e81
Fix postgreSQL migration
2019-03-18 10:47:56 +01:00
Maxime Kohlhaas
0a0e29a089
New fields on user object for hrm purpose
2019-03-16 08:53:06 +01:00
wdammak
5ee749c19d
Update 9.0.0-10.0.0.sql
2019-03-15 20:46:38 +01:00
wdammak
c9f89f3854
Add fk_project to product table
...
Prepare the generation of a product from a project.
2019-03-15 20:28:28 +01:00
Laurent Destailleur
bca18f22ae
Prepare link with expense report line and document
2019-03-15 16:23:38 +01:00
Philippe GRAND
2e4bf72382
update with html5 compliant code
2019-03-15 09:45:48 +01:00
Philippe GRAND
3d93fba4b8
update with html5 compliant code
2019-03-15 09:45:01 +01:00
Philippe GRAND
404872298f
update with html5 compliant code
2019-03-15 09:44:17 +01:00
Philippe GRAND
f028f74c7c
update with html5 compliant code
2019-03-15 09:43:33 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
2019-03-14 17:48:44 +01:00
Laurent Destailleur
7e31e6b4f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
c32551cb62
Fix size of varchar
2019-03-13 13:42:14 +01:00
Laurent Destailleur
88c02143fa
Fix missing fields
2019-03-13 13:40:57 +01:00
Laurent Destailleur
6ae36ce6a7
Work on BOM
2019-03-12 19:20:01 +01:00
Laurent Destailleur
f356d534cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-11 17:48:03 +01:00
Laurent Destailleur
9c8aff0a28
FIX #10787
2019-03-11 17:47:53 +01:00
Laurent Destailleur
def8e770ca
Fix name of indexes
2019-03-11 17:47:19 +01:00
wdammak
fa3246e70b
Missing index to improve the performance of product/variants display
2019-03-10 03:09:23 +01:00
wdammak
0241b0d4ee
Missing index to improve the performance of product/variants display
...
https://github.com/Dolibarr/dolibarr/issues/10787
2019-03-10 03:05:15 +01:00
Laurent Destailleur
10b9fdc1fd
Fix column definition
2019-03-09 02:05:28 +01:00
Laurent Destailleur
f54eb78260
NEW Show the latest date of subscription in member statistics reports
2019-03-07 12:22:24 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
e67890bd22
NEW Can enter price with or without tax when entering expense repor line
2019-03-07 11:09:04 +01:00
Laurent Destailleur
1b0aec0847
Complete fields for template invoices
2019-03-06 20:51:07 +01:00
Laurent Destailleur
0c2a0c643b
NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__
2019-03-06 14:33:05 +01:00
Laurent Destailleur
c06d2f6c3b
Remove warning
2019-03-05 18:22:03 +01:00
Laurent Destailleur
925def5390
Work on BOM module
2019-03-04 13:37:00 +01:00
Laurent Destailleur
2448d1deaa
fk_projet -> fk_project
2019-02-27 15:32:18 +01:00
atm-quentin
1b9a2e5cfc
FIX migration 9 to 10
2019-02-27 09:27:15 +01:00
atm-quentin
f51b89def3
NEW supplier buyprice barcode
2019-02-27 09:22:34 +01:00
Laurent Destailleur
014c199173
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2019-02-27 01:28:12 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin
2019-02-27 01:16:21 +01:00
Laurent Destailleur
9e82c37963
WIP Start module BOM
2019-02-26 19:27:04 +01:00
Laurent Destailleur
3ba69fc93a
Fix missing ; after sql request
2019-02-25 15:06:55 +01:00
Laurent Destailleur
1be1ee1670
Remove duplicate record
2019-02-25 14:56:28 +01:00
Laurent Destailleur
c0be66b5e5
FXI Remove duplicate record before trying to create unique key
2019-02-25 14:55:29 +01:00
Alexandre SPANGARO
2da1447a0b
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Laurent Destailleur
f83f746123
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
2019-02-23 16:03:40 +01:00
Laurent Destailleur
cdf85b0d00
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-23 16:02:35 +01:00
Laurent Destailleur
9ba6e3f8f5
FIX #10638
2019-02-23 15:57:57 +01:00
ptibogxiv
c54c4f8667
Update llx_commande.sql
2019-02-20 12:18:20 +01:00
ptibogxiv
d490dd4dec
NEW POS support in order
...
Save informations for online / API shopping and push to invoice
2019-02-20 12:15:43 +01:00
Laurent Destailleur
51441242bf
Fix sql error
2019-02-19 13:15:11 +01:00
Laurent Destailleur
ebfb6beee3
Merge
2019-02-18 19:14:42 +01:00
Laurent Destailleur
317f3dd90b
Merge pull request #10603 from wdammak/patch-27
...
Add default warehouse id for a user
2019-02-15 15:06:21 +01:00
Laurent Destailleur
662d707320
Update 9.0.0-10.0.0.sql
2019-02-15 15:06:00 +01:00
wdammak
2fe3b7acc7
Add default warehouse for a user
2019-02-14 19:50:57 +01:00
wdammak
0a8c72c93b
rename column default_warehouse to fk_warehouse
2019-02-14 19:36:23 +01:00
Laurent Destailleur
04942d3016
Merge branch 'develop' into patch-110
2019-02-14 16:11:56 +01:00
Laurent Destailleur
567d92f886
Update llx_prelevement_facture_demande.sql
2019-02-14 16:10:31 +01:00
Laurent Destailleur
00cfee0c37
Update 9.0.0-10.0.0.sql
2019-02-14 16:10:06 +01:00
wdammak
31bcc47b68
Add default warehouse id for a user
...
This will help to organize employees and know the default warehouse for a customer.
2019-02-14 13:47:02 +01:00
Laurent Destailleur
3050366372
Fix table of units already exists. Merge duplicate c_measuring_units
...
with c_units.
2019-02-14 13:02:44 +01:00
Laurent Destailleur
5a0d4c4cdc
Merge branch 'develop' into patch-110
2019-02-14 10:32:05 +01:00
florian HENRY
e2d13c0e1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
ptibogxiv
8f3ffc6520
NEW stripe payment intent
...
use it for stripe
2019-02-12 19:03:45 +01:00
Laurent Destailleur
5fceee3048
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 19:02:19 +01:00
ptibogxiv
85272b8345
NEW support stripe payment prelevement
2019-02-12 18:58:57 +01:00
florian HENRY
914de5e089
fix mùigration script
2019-02-12 18:08:21 +01:00
Laurent Destailleur
f7d183f3ef
Add Kosovo country
2019-02-12 17:43:38 +01:00
florian HENRY
eba4be2335
ad missing files
2019-02-12 17:03:47 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
f311d50201
Fix unique key in accounting_account
...
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 15:53:43 +01:00
Laurent Destailleur
a0c1e5ed84
Fix unique key in accounting_account
2019-02-12 15:43:24 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
6f6a767255
Merge pull request #10520 from aspangaro/develop
...
NEW: Add subledger in various payment
2019-02-12 13:20:58 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Alexandre SPANGARO
2ba8ae00e4
Merge remote-tracking branch 'upstream/develop' into develop
2019-02-06 21:56:01 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Alexandre SPANGARO
13cf3b1d7f
Add subledger in various payment
2019-02-01 15:50:12 +01:00
Laurent Destailleur
eb3621839a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
57797b1309
Remove image
2019-01-31 12:48:51 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
56838bc659
Fix missing field into migration
2019-01-27 18:11:18 +01:00
Laurent Destailleur
c33860cfab
Merge pull request #10368 from ptibogxiv/patch-91
...
NEW thirdparty in donation if option ON
2019-01-27 18:07:46 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
70c52e6417
Add field calling_duration in table llx_actioncomm
2019-01-26 01:17:41 +01:00
Laurent Destailleur
b1a4e3abd5
To be sure table is dropped
2019-01-21 16:44:51 +01:00
Laurent Destailleur
0f61a99cc6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 05:51:35 +01:00
Laurent Destailleur
f8b205aae3
Fix missing index
2019-01-21 05:16:23 +01:00
Laurent Destailleur
95bfecdd60
Fix missing index in migration
2019-01-21 05:03:31 +01:00
Laurent Destailleur
9c1339ae06
Fix migration with pgsql
2019-01-21 04:27:30 +01:00
Laurent Destailleur
f53232e2f9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 02:56:32 +01:00
Laurent Destailleur
2e9e413e17
Try pgsql fix
2019-01-21 01:51:28 +01:00
Laurent Destailleur
7493ba018a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-01-20 20:38:26 +01:00
Laurent Destailleur
3ddfcbe3bb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays
...
Add configurable days to SEPA Withdrawal Execution Date
2019-01-20 19:47:57 +01:00
Laurent Destailleur
f7c11ec7f4
Fix unit test on accounting
2019-01-20 17:06:24 +01:00
markus
a45ea9239d
Rename consts and cleanup
2019-01-19 14:24:20 +01:00
ptibogxiv
754714abf7
Update llx_don.sql
2019-01-18 11:23:59 +01:00
ptibogxiv
a36cf5f2c7
Update 9.0.0-10.0.0.sql
2019-01-17 20:34:45 +01:00
ptibogxiv
389b44faa3
Update llx_subscription.sql
2019-01-17 17:41:45 +01:00
ptibogxiv
ee595ca9b5
Update 9.0.0-10.0.0.sql
2019-01-17 17:40:47 +01:00
Laurent Destailleur
e7943ae844
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Regis Houssin
41a38b3a0a
FIX avoid php warning
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-15 15:44:45 +01:00
Laurent Destailleur
003f499eb0
Add url_id into unique index of bank_url
2019-01-09 13:02:19 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
5f9bbbcdd7
Fix migration
2019-01-03 11:12:14 +01:00
ldestailleur
bc00fb177a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:15 +01:00
ldestailleur
a9e8e13bb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
ChangeLog
htdocs/user/param_ihm.php
2019-01-02 19:41:39 +01:00
Laurent Destailleur
63beb50465
Fix missing migration of external site module
2018-12-26 21:22:12 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
e7b3c91645
Fix dump file
2018-12-26 19:10:22 +01:00
Laurent Destailleur
9d5a91b6e8
Merge pull request #10235 from torvista/sql-install
...
Added Andorra, Hungary, Portugal, Slovenia. Spain postcodes
2018-12-17 21:14:48 +01:00
Laurent Destailleur
623afd1020
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-12-17 18:50:06 +01:00
Laurent Destailleur
ffaff4dc7f
Debug website module
2018-12-17 17:29:04 +01:00
Laurent Destailleur
6ee484e2a2
Fix migration
2018-12-17 09:38:36 +01:00
Laurent Destailleur
e0e298f07b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed
Standardize code.
2018-12-17 03:25:45 +01:00
torvista
54c56ff069
minor error
2018-12-16 22:15:44 +01:00
torvista
6ce76903a5
removed double quotes as per Travis failure
2018-12-16 21:22:31 +01:00
torvista
f5d1eea4dc
added regions and provinces for Andorra, Hungary, Portugal, Slovenia.
...
Spain added postcodes and re-ordered sql in province order to make a logical drop-down picking list.
2018-12-16 18:28:11 +01:00
Laurent Destailleur
54a4a54afe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
1c49599a47
Work on cash fence feature
2018-12-15 19:46:51 +01:00
Laurent Destailleur
54ffba793f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
htdocs/langs/en_US/admin.lang
2018-12-15 18:21:37 +01:00
Laurent Destailleur
33a91ff707
Add missing POS closure feature
2018-12-15 16:47:06 +01:00
andreubisquerra
cdaf048766
First CashControl version
2018-12-15 16:45:36 +01:00
Laurent Destailleur
1167d9aecb
Merge pull request #10206 from andreubisquerra/master
...
First CashControl version
2018-12-15 16:44:24 +01:00
Laurent Destailleur
6761e21921
Update 8.0.0-9.0.0.sql
2018-12-15 12:52:09 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
015567afa6
Merge pull request #10034 from frederic34/oldfiles
...
remove Old files on upgrade
2018-12-14 19:25:01 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members
2018-12-14 11:39:02 +01:00
Laurent Destailleur
63aa7ac1ec
Fix name of key
2018-12-14 11:16:05 +01:00
Laurent Destailleur
2f075147a3
Migrate to 10
2018-12-14 11:13:48 +01:00
Laurent Destailleur
3765db422a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/tables/llx_loan.sql
2018-12-14 10:57:11 +01:00
Laurent Destailleur
6eaa6a1d28
Add missing column
2018-12-14 10:56:13 +01:00
Laurent Destailleur
fec64a78ab
Merge branch 'develop' into New_manage_loan_schedule
2018-12-14 10:54:09 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Laurent Destailleur
0ecdb0f3bb
Code comment
2018-12-12 13:02:18 +01:00
Laurent Destailleur
ea041693b6
Code comment
2018-12-12 12:54:10 +01:00
Laurent Destailleur
b47e7b2267
Work on new unsubscribe process
2018-12-11 09:49:46 +01:00
Laurent Destailleur
b27ec54379
A better way to manage unsubscribed emails
2018-12-10 14:35:33 +01:00
Laurent Destailleur
42d4cf9992
Fix sql
2018-12-10 10:17:54 +01:00
andreubisquerra
939f31c71f
First CashControl version
2018-12-08 21:33:54 +01:00
Laurent Destailleur
cd3716ff9f
Dolibarize module ticket
2018-12-08 16:37:41 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
b43c2ce839
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:52:12 +01:00
Laurent Destailleur
930312b425
FIX Migration do not create not used table
2018-12-08 11:51:46 +01:00
Laurent Destailleur
9ed34e2b35
FIX Can relaunch install on v8
2018-12-08 11:51:01 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Laurent Destailleur
d2f0c87d8f
FIX Removed not use table
2018-12-08 11:41:08 +01:00
Laurent Destailleur
a44dca7e71
Removed deprecated table
2018-12-08 11:37:47 +01:00
Laurent Destailleur
d0a1c523ca
FIX several critical bugs in migration of directory of users
2018-12-07 19:53:02 +01:00
Laurent Destailleur
f99d9a7da9
FIX several critical bugs in migration of directory of users
2018-12-07 19:35:38 +01:00
Laurent Destailleur
2621af96d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
2018-12-07 19:08:53 +01:00
Laurent Destailleur
3538e9ab3b
Fix migration
2018-12-07 19:05:24 +01:00
Laurent Destailleur
37fe8afea3
Code comment
2018-12-07 14:54:40 +01:00
Laurent Destailleur
65d492efed
Minor fix
2018-12-07 14:53:49 +01:00
Laurent Destailleur
e7c87c31b6
Code comment
2018-12-06 21:32:39 +01:00
Laurent Destailleur
30abedbcbd
Minor fix
2018-12-06 19:29:11 +01:00
Maxime Kohlhaas
b37209565f
Correct sql index change
2018-12-05 16:50:02 +01:00
Laurent Destailleur
d2e8aeb8c1
Merge pull request #10173 from hregis/develop_upgrade
...
FIX wrong path, multidir_output[] for each entity is construct by the multicompany module
2018-12-04 13:39:05 +01:00
Laurent Destailleur
c27c322457
Merge pull request #10172 from hregis/develop_virtualmin
...
FIX possibility to force install lock with GET/POST or script
2018-12-04 13:38:23 +01:00
Laurent Destailleur
d9bb39970f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/barcode.php
2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
2018-12-04 13:17:25 +01:00
Laurent Destailleur
347384734d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
2018-12-04 13:15:32 +01:00
Regis Houssin
aa3e520725
FIX wrong path, multidir_output[] for each entity is construct by the
...
multicompany module
2018-12-04 09:12:36 +01:00
Maxime Kohlhaas
79b6719b88
Change index
2018-12-04 09:00:53 +01:00
Regis Houssin
dcbb7c49fc
FIX wrong value for instal lock
2018-12-03 13:31:28 +01:00
Regis Houssin
a2f514d4a1
FIX possibility to force install lock with GET/POST or script
2018-12-03 13:12:42 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Maxime Kohlhaas
72225f6524
Migration of user photo paths
2018-12-01 23:57:15 +01:00
Laurent Destailleur
c3e2f73e48
FIX #10144
2018-12-01 19:45:30 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
2018-12-01 18:19:45 +01:00
florian HENRY
589511f38c
fix #9999
2018-12-01 16:23:40 +01:00
Frédéric FRANCE
335327827d
Update 6.0.0-7.0.0.sql
2018-12-01 00:34:17 +01:00
Frédéric FRANCE
0270da7d8c
Update 5.0.0-6.0.0.sql
2018-12-01 00:28:58 +01:00
Frédéric FRANCE
6ab12b5911
Update llx_paiementfourn.sql
2018-12-01 00:26:51 +01:00
Maxime Kohlhaas
7585461486
Fix #9070
2018-11-30 22:16:17 +01:00
Laurent Destailleur
bfc2f6e84c
Add template
2018-11-29 00:48:47 +01:00
Laurent Destailleur
dbef8fc380
FIX Add field for data becoming mandatory by some online payment system
2018-11-28 13:13:38 +01:00
Laurent Destailleur
2f2df12f59
Complete dictionary
2018-11-26 18:02:25 +01:00
Laurent Destailleur
9f610c2279
Add website template
2018-11-23 12:46:32 +01:00
Laurent Destailleur
200de22807
Missing image in container
2018-11-20 16:48:34 +01:00
Laurent Destailleur
f455e32bef
FIX Some modules templates were visible when it should not
2018-11-20 16:22:16 +01:00
Laurent Destailleur
39621ec686
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-11-19 20:07:51 +01:00
Laurent Destailleur
fb6aa01207
FIX #10030 better german chart
2018-11-19 20:04:31 +01:00
Frédéric FRANCE
8f7e90da8c
clean clean
2018-11-19 19:08:14 +01:00
Alexandre SPANGARO
2d55666a0b
NEW Add gender in member card
2018-11-18 21:50:58 +01:00
Laurent Destailleur
7f33403d43
Fix translation
2018-11-17 22:55:13 +01:00
Frédéric FRANCE
35142ac2fb
wip
2018-11-16 17:58:14 +01:00
Laurent Destailleur
6d640ab83c
Fix feature to drag and drop rows of table (not generic)
2018-11-15 19:58:06 +01:00
markus
ac0f46f9e5
for Denmark: forme_jurisdisque additions
2018-11-15 11:10:54 +01:00
Laurent Destailleur
7aa042172e
Fix sql error
2018-11-14 13:06:40 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
4f7d3e794a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47
FIX #9992
2018-11-11 17:28:17 +01:00
Laurent Destailleur
2985d9cfbf
Update 8.0.0-9.0.0.sql
2018-11-11 17:27:16 +01:00
delcroix Patrick
52f35d8038
to support proposal_supplier insert
...
proposal_supplier has 17 char when the elementtype column can take only 16 char
2018-11-10 14:59:46 +01:00
Laurent Destailleur
f1287578f3
Work on emailcollector
2018-11-09 18:18:17 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
193b153fbf
Work on email collector
2018-11-07 18:02:08 +01:00
Laurent Destailleur
eb9defcf1d
Debug emailcollector
2018-11-05 16:42:29 +01:00
Laurent Destailleur
52d4426e87
Debug new modules
2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7
Fix emailcollector
2018-11-05 15:31:41 +01:00
Laurent Destailleur
0c7f33e1ba
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-05 09:56:57 +01:00
Laurent Destailleur
98a3af620b
FIX #9934
2018-11-05 09:26:23 +01:00
Laurent Destailleur
67fbb3dbb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-11-03 19:15:52 +01:00
Laurent Destailleur
28d5f1d50b
Fix sql syntax error
2018-11-03 11:30:32 +01:00
Maxime Kohlhaas
d1133916e0
Fix tracking field in dictionnary should not be mandatory
2018-11-01 15:33:14 +01:00
Laurent Destailleur
970f501147
Debug modulebuilder
2018-10-31 20:10:20 +01:00
Laurent Destailleur
c9ef298839
Fix setup template emails
2018-10-31 11:38:04 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Regis Houssin
28360f6710
FIX add to migrate_delete_old_files
2018-10-28 09:41:11 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
622f31fd1e
Fix ref
2018-10-26 19:01:42 +02:00
Laurent Destailleur
d3893b8b95
Debug v9
2018-10-26 19:00:24 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
8b601bd7fd
Fix numbering of holidays
2018-10-25 18:50:53 +02:00
Laurent Destailleur
25a374bd9a
NEW Notification module support expense report+holiday validation and
...
approval event.
2018-10-25 12:45:13 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
36323752ed
Project must be on a dedicated field
2018-10-24 12:00:54 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
Laurent Destailleur
b7d91c30d9
FIX missing symbol for indian rupies
2018-10-23 12:38:12 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
atm-greg
ff92572d56
add insurance amount on loan
2018-10-18 17:03:49 +02:00
atm-quentin
83c8a78628
NEW auto event msg
2018-10-15 17:08:28 +02:00
Laurent Destailleur
eff0e959b3
Fix duplicate column
2018-10-10 13:06:54 +02:00
Laurent Destailleur
8f4b74733c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
df0ec95b22
Code comment and better error message
2018-10-09 21:21:10 +02:00
Laurent Destailleur
9fe3e7b6c0
Fix phpunit
2018-10-09 17:09:33 +02:00
Laurent Destailleur
1d04ce2185
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-10-09 17:07:32 +02:00
Laurent Destailleur
dc498173c8
Code comment
2018-10-09 16:58:55 +02:00
Laurent Destailleur
c401739fed
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 16:28:03 +02:00
Laurent Destailleur
b4b82ce3d6
Drop both contraint and index
2018-10-09 16:25:57 +02:00
Laurent Destailleur
bde5ee1232
Merge pull request #9621 from ptibogxiv/patch-69
...
Prepare for more stripe function
2018-10-09 16:15:23 +02:00
Laurent Destailleur
b68f6c0fca
Use more generic name
2018-10-09 16:15:12 +02:00
Laurent Destailleur
422af361b4
Merge pull request #9622 from ptibogxiv/patch-68
...
Prepare for more stripe function
2018-10-09 16:14:35 +02:00
Laurent Destailleur
65b48b06d9
Update llx_paiement.sql
2018-10-09 16:14:28 +02:00
Laurent Destailleur
94743d50be
Merge pull request #9707 from aspangaro/9.0_FEC
...
NEW Add FEC Export in accountancy
2018-10-09 13:05:20 +02:00
Laurent Destailleur
41f2289ffa
Save pos station into invoice
2018-10-08 22:28:30 +02:00
Alexandre SPANGARO
75b9862c14
New : Add FEC Export in accountancy
2018-10-08 21:01:21 +02:00
Laurent Destailleur
f9f93f58df
Add field to track source module of invoice
2018-10-07 13:49:09 +02:00
Laurent Destailleur
402a383c83
Uniformize field os social networks
2018-10-07 13:31:40 +02:00
Laurent Destailleur
3a0d777df7
Merge pull request #9649 from lex111/replaces-load
...
Replace multiple load calls with loadLangs method
2018-10-04 17:05:48 +02:00
Laurent Destailleur
111d589474
NEW Can mix offset before and after with rules for due date of invoices
2018-10-04 16:06:26 +02:00
atm-quentin
00f532c436
validation modèle de données
2018-10-04 09:50:39 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
atm-quentin
41d8cb87a3
debut reception setup page
2018-10-03 12:22:41 +02:00
Laurent Destailleur
56cb0763d1
Add maincolor property on website
2018-10-02 16:46:54 +02:00
Laurent Destailleur
53b0ac8217
Rename template
2018-10-01 21:25:51 +02:00
Laurent Destailleur
af497271a4
Rename template website
2018-10-01 21:00:54 +02:00
Laurent Destailleur
a8f16f6570
Update template web site
2018-10-01 20:59:17 +02:00
Alexey Pyltsyn
49de7a5881
Replace multiple load calls with loadLangs method
2018-10-01 09:22:23 +03:00
Frédéric FRANCE
2b8ec8db1f
Update llx_takepos_floor_tables.sql
2018-09-30 10:33:52 +02:00
Frédéric FRANCE
6f48f37fa0
Update 8.0.0-9.0.0.sql
2018-09-30 10:31:08 +02:00
Laurent Destailleur
a4ec613d73
Move sql table
2018-09-28 19:40:44 +02:00
ptibogxiv
a05bdccb06
Prepare for more stripe function
2018-09-27 10:47:58 +02:00
ptibogxiv
78b8881c44
Prepare for more stripe function
...
support refund, dispute, capture....
2018-09-27 10:43:43 +02:00
Carsten Brandt
fee46ac845
Update german accounting file to use rowid
...
- fix "TODO Fix this file to use rowid"
2018-09-27 09:39:00 +02:00
Laurent Destailleur
0004cbde96
Merge pull request #9617 from cebe/fix-german-account-rowids
...
Update german accounting file to use rowid
2018-09-27 09:36:09 +02:00
Carsten Brandt
73ed340766
Update german accounting file to use rowid
...
- fix "TODO Fix this file to use rowid"
2018-09-26 11:52:06 +02:00
IJ
68dc213601
Correct Google+ to plus
2018-09-26 07:36:22 +01:00
IJ
9fd7d98c26
Add social fields
2018-09-26 07:35:26 +01:00
IJ
d063f6fdeb
Add social fields
2018-09-26 07:34:09 +01:00
IJ
c90cd4ae29
Add more social fields
2018-09-26 07:21:21 +01:00
Laurent Destailleur
c2335c0a5e
Update websote template
2018-09-26 00:17:53 +02:00
Laurent Destailleur
e6be047178
Work on new management for website module
2018-09-25 15:00:37 +02:00
Laurent Destailleur
e07ce644e8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Laurent Destailleur
2d8eb034e3
FIX Maxi debug to allow to load chart of account with multicompany
2018-09-17 21:02:07 +02:00
Laurent Destailleur
b4264ee0a0
Use font awesome for sort image
2018-09-12 21:57:32 +02:00
Laurent Destailleur
f5074f4962
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 18:12:17 +02:00
Laurent Destailleur
b341cb9245
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/tpl/objectline_view.tpl.php
2018-09-12 18:11:51 +02:00
Laurent Destailleur
fd93a22dca
Fix missing field
2018-09-12 16:45:12 +02:00
Laurent Destailleur
72895bebbf
Add field twitter and facebook
2018-09-12 13:18:03 +02:00
Laurent Destailleur
af2e19eba8
Replace skype module with social networks module to support more fields
2018-09-12 10:55:45 +02:00
Laurent Destailleur
538a2cc647
NEW Add first template of website
2018-09-08 13:55:15 +02:00
Laurent Destailleur
ab8155f170
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Laurent Destailleur
69cf7026eb
NEW Close #9296 Add field ref_ext into llx_categorie
2018-09-04 11:29:52 +02:00
Laurent Destailleur
f2ec94e9fd
FIX #9353 Bug: html error - div inside span on graphs
2018-09-04 11:13:54 +02:00
Laurent Destailleur
6b3ccddb65
FIX #9396
2018-09-04 10:14:45 +02:00
Laurent Destailleur
540999faa5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
2018-09-03 14:06:51 +02:00
Laurent Destailleur
47655f0725
Add comment as FIXME
2018-09-03 14:00:12 +02:00
Laurent Destailleur
d050c0654b
FIX Add "-- ADD xxx to rowd" to avoid rowid conflict on account chart
2018-09-03 13:14:25 +02:00
Laurent Destailleur
c5c0491ea7
Fix restaure behavior account_parent point ro rowid
2018-09-03 12:59:20 +02:00
Laurent Destailleur
bf6463b152
Revert old behaviour
2018-09-03 12:54:20 +02:00
Laurent Destailleur
c423aebdad
Revert "FIX "account_parent" is linked with "account_number" instead rowid"
...
This reverts commit b1a340b193
2018-09-03 12:51:20 +02:00
Laurent Destailleur
e9f3c131ec
Add the line -- ADD xxx to rowid
2018-09-03 12:42:26 +02:00
Laurent Destailleur
3593b5ac51
Revert "Revert " New:Algerian Chart of accounts""
...
This reverts commit 1d644a33a3
2018-09-03 12:39:01 +02:00
Laurent Destailleur
1d644a33a3
Revert " New:Algerian Chart of accounts"
2018-09-03 11:42:01 +02:00
Bahfir Abbes
09b75fc53e
Update llx_accounting_account_dz.sql
2018-09-02 16:52:41 +01:00
Abbes Bahfir
28a146fb5e
New:Algerian Chart of accounts - First version
2018-09-02 16:44:07 +01:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
bb2f5ad588
Fix missing migration
2018-09-01 11:30:14 +02:00
Laurent Destailleur
ca2e9f20f6
Fix missing extrafield table
2018-08-31 18:39:13 +02:00
Laurent Destailleur
872273ef95
Update fileconf.php
2018-08-29 21:46:39 +02:00
Steve
642f5fd343
Merge pull request #2 from Dolibarr/develop
...
update 28/8/2018
2018-08-28 08:29:09 +02:00
Laurent Destailleur
9c6ce4b29d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-28 02:36:15 +02:00
Laurent Destailleur
2db84a679e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
2018-08-28 02:35:45 +02:00
Laurent Destailleur
0a7ce338f9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-08-28 02:23:34 +02:00
Laurent Destailleur
ad0cc098ee
Fix alter forgot
2018-08-28 01:37:25 +02:00
gauthier
79aa390fe8
FIX : table llx_chargessociales doesn't exists
2018-08-27 15:07:19 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
torvista
710ce6a9f7
Add description to database prefix field to avoid confusion when not specifying a database prefix.
2018-08-19 00:09:34 +02:00
torvista
8426f0e6cb
Main url auto-filled field was hardcoded as http: easy to overlook this when running installer via https.
...
This sets protocol to be the same as the installer page.
2018-08-18 23:45:20 +02:00
Laurent Destailleur
4e02b134da
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-16 14:50:04 +02:00
Laurent Destailleur
4c52384609
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-08-16 14:47:56 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
florian HENRY
20309665e6
fix : ODT project substitution
2018-08-14 10:45:08 +02:00
Laurent Destailleur
2cbbb6e622
Prepare 8.0.0 release
2018-08-13 23:04:58 +02:00
Laurent Destailleur
f96dd391fa
Fix error in foreign key pointing to old table
2018-08-13 16:11:23 +02:00
Frédéric FRANCE
1b27cca91c
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-13 08:53:07 +02:00
Laurent Destailleur
d09850522b
Fix migration
2018-08-12 22:27:54 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 19:54:03 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description
...
NEW Can record the supplier product description
2018-08-12 18:56:27 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
John BOTELLA
d6d8f98f38
add retained warranty cond field and add forms
2018-08-10 15:06:00 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3
2018-08-09 11:31:48 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
John BOTELLA
06be98c638
add date field
2018-08-08 17:36:39 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
John BOTELLA
3036c94198
Add new situation retained warranty field
2018-08-07 15:18:42 +02:00
atm-greg
be63f0dc89
add migration for desc_fourn
2018-08-07 09:49:57 +02:00
atm-greg
ad5f59822e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
7063850034
add sql field
2018-08-06 16:32:25 +02:00
Regis Houssin
b1a340b193
FIX "account_parent" is linked with "account_number" instead rowid
2018-08-03 14:01:00 +02:00
Regis Houssin
fa32e48b8a
FIX change column "account_parent" and missing modify column
2018-08-03 13:53:12 +02:00
