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

2529 Commits

Author SHA1 Message Date
Laurent Destailleur
8a7f7b3551 FIX Request on purchase orders in timeout even on very small databases 2020-12-03 18:38:18 +01:00
Laurent Destailleur
210ccc4b43 FIX Missing very important performance indexes 2020-12-03 18:34:32 +01:00
Laurent Destailleur
d88173d7ba Fix bad column 2020-12-02 19:13:32 +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
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
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
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-25 12:59:32 +01:00
Florian HENRY
12ef03f06d fix banck tranfert supplier 2020-11-25 10:58:34 +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
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
Aurélien
d9d32524f7
Fix #14460 2020-11-13 00:36:25 +01:00
Laurent Destailleur
42ea51be49 Fix migration 2020-11-11 07:43:45 +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
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
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
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
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
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
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
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
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +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
Laurent Destailleur
c7ca99accb Fix default value of enabled property of menu entry 2020-10-07 15:38:07 +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
Frédéric FRANCE
b78e506e39
add files 2020-10-02 00:25:44 +02:00
Florian
c89f8b323b Rename fk_typeobject to type_object 2020-10-01 15:18:19 +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
Florian
bdb38da9d3 Add 2 new field typeObject and ObjectId to website 2020-09-28 18:17:23 +02:00
Laurent Destailleur
83bdd530cd Fix sql error in menu edition, column too short 2020-09-25 10:13:45 +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
Laurent Destailleur
5f4547bf7c Prepare table for future features 2020-09-22 10:38:16 +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
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
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
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
451c878cfc Fix add missing field 2020-09-04 22:42:37 +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
Laurent Destailleur
7c39543c72 Support trigger in module recruitment 
Enhance generic code of automatic recording events
 2020-08-25 12:47:38 +02:00
andreubisquerra
e032ddc035
Change variable to pos_change 2020-08-23 22:27:18 +02:00
Laurent Destailleur
3fe0ffe7e2 Add unique index on email_msgid of candidatures 2020-08-23 15:18:31 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +02:00
Laurent Destailleur
dabe804299 Add numbering modules for candidatures. Mass action Validate. 2020-08-22 03:49:46 +02:00
Laurent Destailleur
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +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
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
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
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
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +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
31cb57afc9 Fix regression with ecoterm 2020-07-18 23:27:43 +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
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +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
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
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
c2a9819daa Debug establishment management 2020-05-29 21:45:50 +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
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
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
4913d10724
Merge branch 'develop' into patch-339 2020-05-23 15:14:06 +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
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
Laurent Destailleur
514009ca6d Add field position in llx_website 2020-05-18 15:47:21 +02:00
ptibogxiv
703fee0635
Update llx_commande.sql 2020-05-15 15:58:01 +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
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
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
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
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
e050429854
Update llx_commandedet.key.sql 2020-04-18 15:48:45 +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
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
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
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
8567001a46
Merge pull request #13549 from oscim/patch-34 
Update llx_societe_rib.key.sql
 2020-04-10 11:11:13 +02: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
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
6f0071bebe FIX sort on company on member list 2020-03-31 17:54:48 +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
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
Laurent Destailleur
226f4695cd Fix migration of type of field 2020-03-22 19:48:53 +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
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
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +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
Laurent Destailleur
c14daa2790 Can set main language and sublanguages of a website 2020-02-19 18:32:04 +01:00
Laurent Destailleur
058524ff82 Comment 2020-02-10 02:29:09 +01:00
Laurent Destailleur
f114ca9479 Missing column import_key on ticket table 2020-02-07 15:53:50 +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
d827e3289a Removed no more used field "amount" in llx_facture 2020-01-31 15:12:17 +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
206cfcd7fe Clean code for inventory 2020-01-20 02:07:47 +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
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
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
d93de4b931 FIX Import of customer prices per segment was not possible 2020-01-02 20:08:43 +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
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
Laurent Destailleur
22f3b69666 Fix default value for situation invoice 2019-12-22 11:59:38 +01:00
Laurent Destailleur
c0ef3b46ad Work on MRP module 2019-12-20 15:31:05 +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
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +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
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +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
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
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
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
Frédéric FRANCE
9dcf53c65e
add tables 2019-11-13 20:56:36 +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
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
1b701f162a FIX #12307 2019-11-05 13:16:39 +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
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
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
036c1410c7 NEW Save user of last modification in donation record 2019-10-31 23:17:08 +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
Frédéric FRANCE
08f182fe98
Update llx_mrp_mo.key.sql 2019-10-27 17:49:41 +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
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
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
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 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
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +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
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
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
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
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
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
e02794248e
Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +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
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
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
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
07b555b965
Merge branch 'develop' into patch-255 2019-09-27 15:23:15 +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
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +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
atm-quentin
c09f2d8c4e NEW stock categories 2019-09-19 16:21:03 +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
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
bed959bb38
add entity 2019-09-12 21:17:52 +02:00
Frédéric FRANCE
3e11476810
add socialnetworks dictionary 2019-09-11 23:09:20 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187 2019-09-10 20:46:54 +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
Frédéric FRANCE
4054ebaf27
wip 2019-09-07 15:12:07 +02:00
Laurent Destailleur
ca71f02d41
Merge branch 'develop' into develop_pdf 2019-09-06 23:30:12 +02:00
Laurent Destailleur
e1ee70fd8f Start to implement date selection of supplier proposals 2019-09-06 12:45:27 +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
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
d668b79738 NEW Add column tms into the table of targets for emailing 2019-08-28 18:14:46 +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
869e497a48
NEW : Platforme compliance with Stripe Connect 2019-08-21 16:41:36 +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
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
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
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
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
Alexandre SPANGARO
8b8aaafc05 Merge branch 'develop' into 10.0_intracommreport 2019-07-20 05:47:31 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +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
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
e5d34de877 FIX compatibility mysql 8. rank is reserved 
FIX Permission for BOM menu
 2019-07-09 00:14:01 +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
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
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
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
20b516885f WIP 2019-06-20 09:33:01 +02:00
Laurent Destailleur
40023c8ba2
Merge branch 'develop' into patch-174 2019-06-20 03:56:29 +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
Nicolas ZABOURI
96c6994827 FIX 2 déclarations of date_valid in SQL 2019-06-18 10:55:16 +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
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
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
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
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
95bb8a1f75
Update llx_c_shipment_mode.key.sql 2019-05-08 01:57:39 +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
Laurent Destailleur
3a8d645fb9 Debug module ticket 2019-05-01 20:55:46 +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
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
fae2983c2a
Merge branch 'develop' into new_user_hr_fields 2019-04-11 18:27:58 +02:00
Laurent Destailleur
65e931cfe2 Work on email collector 2019-04-08 21:22:10 +02:00
ptibogxiv
63ad6b779a
Update llx_adherent_type.sql 2019-03-27 12:49:26 +01:00
Laurent Destailleur
4c4ad0548d Fix for creation of index composed with type 2019-03-26 17:56:46 +01:00
Laurent Destailleur
8ca5b2e45f Rename field 2019-03-22 17:43:53 +01:00
Laurent Destailleur
ae2f76f6bd
Update llx_product.sql 2019-03-21 18:32:40 +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
Maxime Kohlhaas
0a0e29a089 New fields on user object for hrm purpose 2019-03-16 08:53:06 +01:00
Laurent Destailleur
bca18f22ae Prepare link with expense report line and document 2019-03-15 16:23:38 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Laurent Destailleur
9c8aff0a28 FIX #10787 2019-03-11 17:47:53 +01:00
Laurent Destailleur
10b9fdc1fd Fix column definition 2019-03-09 02:05:28 +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
925def5390 Work on BOM module 2019-03-04 13:37:00 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +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
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
ptibogxiv
c54c4f8667
Update llx_commande.sql 2019-02-20 12:18:20 +01:00
Laurent Destailleur
51441242bf Fix sql error 2019-02-19 13:15:11 +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
wdammak
2fe3b7acc7
Add default warehouse for a user 2019-02-14 19:50:57 +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
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
ptibogxiv
8f3ffc6520
NEW stripe payment intent 
use it for stripe
 2019-02-12 19:03:45 +01:00
florian HENRY
eba4be2335 ad missing files 2019-02-12 17:03:47 +01:00
Alexandre SPANGARO
13cf3b1d7f Add subledger in various payment 2019-02-01 15:50:12 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +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
70c52e6417 Add field calling_duration in table llx_actioncomm 2019-01-26 01:17:41 +01:00
ptibogxiv
754714abf7
Update llx_don.sql 2019-01-18 11:23:59 +01:00
ptibogxiv
389b44faa3
Update llx_subscription.sql 2019-01-17 17:41:45 +01:00
Laurent Destailleur
003f499eb0 Add url_id into unique index of bank_url 2019-01-09 13:02:19 +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
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
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
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
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +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
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
andreubisquerra
939f31c71f First CashControl version 2018-12-08 21:33:54 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +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
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
c3e2f73e48 FIX #10144 2018-12-01 19:45:30 +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
200de22807 Missing image in container 2018-11-20 16:48:34 +01:00
Alexandre SPANGARO
2d55666a0b NEW Add gender in member card 2018-11-18 21:50:58 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +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
f022be3a47 FIX #9992 2018-11-11 17:28:17 +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
28d5f1d50b Fix sql syntax error 2018-11-03 11:30:32 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
d3893b8b95 Debug v9 2018-10-26 19:00:24 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
Laurent Destailleur
36323752ed Project must be on a dedicated field 2018-10-24 12:00:54 +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
Laurent Destailleur
eff0e959b3 Fix duplicate column 2018-10-10 13:06:54 +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
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
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
Frédéric FRANCE
2b8ec8db1f
Update llx_takepos_floor_tables.sql 2018-09-30 10:33:52 +02:00
Laurent Destailleur
a4ec613d73 Move sql table 2018-09-28 19:40:44 +02:00
ptibogxiv
78b8881c44
Prepare for more stripe function 
support refund, dispute, capture....
 2018-09-27 10:43:43 +02:00
IJ
9fd7d98c26
Add social fields 2018-09-26 07:35:26 +01:00