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

3830 Commits

Author SHA1 Message Date
Laurent Destailleur
2810315dc5 Fix payment of registration of event 2021-09-18 13:19:29 +02:00
Laurent Destailleur
66e58004fb Add column max_attendees for an event 2021-09-18 11:10:00 +02:00
Laurent Destailleur
fdcd523c55
Merge branch 'develop' into develop#1 2021-09-17 11:59:20 +02:00
Florian HENRY
aa575cd250 add column 2021-09-17 11:06:25 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
e6cd071e02 Fix email templates 2021-09-16 12:31:33 +02:00
Laurent Destailleur
3a04fc557b Fix email templates 2021-09-16 12:30:46 +02:00
Laurent Destailleur
f3fcb7a48a Fix insertion of email templates 2021-09-14 16:59:49 +02:00
lmarcouiller
4762fd9c2e Close #18678 : Implemention of tags/categories KM 2021-09-13 11:22:55 +02:00
Laurent Destailleur
5a87d94b3c Add missing fields into llx_holiday 2021-09-09 20:38:25 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
478918bd45 Fix phpunit 2021-09-09 15:59:43 +02:00
Laurent Destailleur
654bf4d672 Fix name of index #18623 2021-09-09 15:07:55 +02:00
Laurent Destailleur
e332ca88e4 Fix missing sql 2021-09-09 15:06:30 +02:00
Laurent Destailleur
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields 
14.0 fix salary extrafields are no more available
 2021-09-09 14:58:54 +02:00
Laurent Destailleur
3c215730db
Merge pull request #18639 from Hystepik/develop_v14#1 
Fix #18633 : fix error message
 2021-09-09 04:56:54 +02:00
Laurent Destailleur
77b8d91895
Update 13.0.0-14.0.0.sql 2021-09-09 04:56:25 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
 2021-09-07 17:47:00 +02:00
Laurent Destailleur
1fda7d43ef Fix sql 2021-09-07 17:45:22 +02:00
Laurent Destailleur
0edf2f344b Fix sql 2021-09-07 17:38:46 +02:00
lmarcouiller
f3babd2819 Fix #18633 : fix error message 2021-09-07 13:59:36 +02:00
Laurent Destailleur
7b43d07a36 Fix sql 2021-09-07 13:01:18 +02:00
Gauthier PC portable 024
383c92f6c6 FIX : migration script 2021-09-06 14:52:11 +02:00
Gauthier PC portable 024
be1c08ddfe FIX : salary extrafields don't work and table is not well named 2021-09-06 12:30:39 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
ptibogxiv
8850bd774c
Update 14.0.0-15.0.0.sql 2021-09-04 19:37:36 +02:00
ptibogxiv
c276882442
Update 14.0.0-15.0.0.sql 2021-09-04 19:36:57 +02:00
Laurent Destailleur
cd313d7506 Save type (manufacture/disassemble) on MO. 2021-09-02 15:23:31 +02:00
Laurent Destailleur
4b7b54e196
Update 14.0.0-15.0.0.sql 2021-09-01 16:32:25 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
426894f6a6 Fix not null column 2021-08-30 21:44:09 +02:00
Adrien Raze
317876eb0c NEW : Update SQL : install and migration 2021-08-30 15:48:22 +02:00
Laurent Destailleur
47b4fd3769 Complete migration 2021-08-17 19:02:16 +02:00
Laurent Destailleur
92d6ad9597 Removed old simple POS module ('cashdesk' module) 2021-08-17 04:57:53 +02:00
Laurent Destailleur
d66df5cb60 Complete #15548 2021-08-11 21:53:21 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
739d8e1c6b Fix data structure 2021-08-09 16:19:23 +02:00
Laurent Destailleur
305314c04e Fix data structure 2021-08-09 16:18:33 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
ea6cfeb0e8 NEW Increase size of params of action for emailcollector 2021-08-03 19:21:18 +02:00
Laurent Destailleur
5ec3245119 Migration 2021-08-03 17:15:55 +02:00
Frédéric FRANCE
099164c043
Merge remote-tracking branch 'upstream/develop' into migration_cat_tickets 2021-08-02 09:01:27 +02:00
jpb
15578c2ec2 merge conflict 2021-07-30 10:57:04 +02:00
Christian Foellmann
b9cb04d4b7
Merge branch 'develop' into agenda-fcomm-cancel 2021-07-29 08:14:02 +02:00
Christian Foellmann
faf50a5aaa add agenda auto creation on supplier_order cancellation 2021-07-27 15:06:28 +02:00
Florian HENRY
f4fd4d8e7d new: ref fourn and ref customer same size as ref product 2021-07-27 12:09:04 +02:00
Frédéric FRANCE
f2dc3be051
add categories tickets migration 2021-07-21 08:40:07 +02:00
jpb
367e839239 change class css and behavior js 2021-07-20 13:56:30 +02:00
jpb
97287af987 add field to object product, add sql 2021-07-19 14:03:03 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
4c29a3ad99 Fix migration 2021-07-13 13:06:28 +02:00
Laurent Destailleur
df3d88570c Fix missing column in migration 2021-07-13 11:39:08 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
 2021-07-12 12:01:53 +02:00
Laurent Destailleur
977600e3a5 v15 2021-07-12 11:55:30 +02:00
Laurent Destailleur
41016039b6 Fix missing very old table 2021-07-11 19:39:18 +02:00
Laurent Destailleur
802ac58f9a Clean v14 2021-07-11 18:56:15 +02:00
damien clochard
4c5bb786ba FIX #18085: Migration 13 to 14 : Explicit cast when changing the type of llx_c_ticket_category.pos 2021-07-06 14:51:53 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
 2021-06-29 15:58:26 +02:00
Laurent Destailleur
1cf3408f5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/class/contact.class.php
 2021-06-29 15:52:39 +02:00
Laurent Destailleur
e62ed28701 Debug v14 2021-06-26 15:39:52 +02:00
Laurent Destailleur
a4e6eb12a8 Fix migration pgsql 2021-06-24 12:46:50 +02:00
Laurent Destailleur
b47fa50d05 Try postgresl migration fix 2021-06-24 12:46:04 +02:00
atm-lena
7eddf43aef FIX List and Create Companies Left Menus 2021-06-23 17:33:02 +02:00
Laurent Destailleur
5697e86c09 Fix columns for export/import profile 2021-06-21 14:12:33 +02:00
Laurent Destailleur
3754c2c3c9 Fix name of field 2021-06-17 00:59:11 +02:00
Laurent Destailleur
8db0ecd4db Add fix of corrupted data 2021-06-16 19:40:43 +02:00
Laurent Destailleur
5f7dddbdcb Fix permissions 2021-06-15 14:49:08 +02:00
Laurent Destailleur
52f0de00f6 Fix missing fields 2021-06-11 13:17:22 +02:00
Laurent Destailleur
9f177a0c63 Debug v14 2021-06-06 16:36:41 +02:00
Laurent Destailleur
70af18148b Debug modulebuilder v14 2021-06-05 17:49:01 +02:00
Laurent Destailleur
34955b1cf9 Fix sql 2021-06-04 12:48:18 +02:00
Laurent Destailleur
456356ded7 Fix migration 2021-06-02 18:45:48 +02:00
Laurent Destailleur
a840afa72a Fix missing entry into table 2021-05-25 15:24:28 +02:00
Laurent Destailleur
4d42235670 Complete experimental module knowledge management 2021-05-18 20:46:14 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Laurent Destailleur
5e0f2f9781 Debug v14. Fix regression. 2021-05-12 22:35:21 +02:00
Laurent Destailleur
3ea6cd1c66 Fix missing columns 2021-05-12 08:53:29 +02:00
Laurent Destailleur
c37588025f
Update 13.0.0-14.0.0.sql 2021-05-11 18:50:02 +02:00
Alexandre SPANGARO
c81b4f8c31 FIX Migration script 2021-05-09 08:31:36 +02:00
Laurent Destailleur
48a1e5c75e
Merge pull request #17499 from bb2a/trigger_update_thirpartie 
Add events trigger update Thirparty and Contact
 2021-05-06 19:14:02 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
0daab6a55a Code comment 2021-05-06 16:50:22 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Laurent Destailleur
475ed369ed
Merge pull request #17490 from marc-dll/FIX_develop_expense_report_db_field 
FIX: expense report: column last_main_doc forgotten in v14 migration script
 2021-05-06 16:27:01 +02:00
Anthony Berton
ed26e75c0b init 2021-05-05 11:54:16 +02:00
Marc de Lima Lucio
ef6ebd4793 FIX: expense report: column last_main_doc forgotten in v14 migration script 2021-05-04 16:24:15 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
da08670a3d
Update 13.0.0-14.0.0.sql 2021-05-04 00:24:32 +02:00
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
Laurent Destailleur
03e8f2aee1 Fix for performance troubles 2021-05-03 18:49:37 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
daraelmin
5ff60c31e6
Update 13.0.0-14.0.0.sql 2021-05-01 20:08:32 +02:00
lmarcouiller
ce677c4f27 Fix #17361 : change of llx_export_model type to varchar(64) 2021-04-30 14:50:18 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
f7182d43fd add entity in c_productbatch_qcstatus key 2021-04-29 13:00:47 +02:00
altairis-noe
762f41ea86 llx_c_productbatch_qcstatus as dictionnary name 2021-04-29 12:49:15 +02:00
lmarcouiller
d4fb9c7c47 knowledgemanager finished 2021-04-29 10:49:56 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Antonin MARCHAL
6dafb98707 Merge branch 'develop' of https://github.com/ibuiv/dolibarr into develop 2021-04-29 01:20:42 +02:00
Antonin MARCHAL
c89830b25b fix(sql) pmp added to create table both migration and install 2021-04-29 01:17:21 +02:00
Laurent Destailleur
b56b9aa707
Merge branch 'develop' into develop 2021-04-28 16:05:07 +02:00
antonin_tdj
0108826ee5
add column instead of just add 2021-04-28 16:03:40 +02:00
Gauthier PC portable 024
4af2f8871a FIX : on update current_timestamp 2021-04-28 12:27:07 +02:00
altairis-noe
9fc67275fd llx_c_productbatch_status to migration and translatable strings 2021-04-27 15:55:51 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
Antonin MARCHAL
5fd0c1b810 fix(code)eldy's remarks 2021-04-27 09:55:35 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
Dorian Vabre
e9b35cf36b mail template modified to add company name and remove useless payment link 2021-04-23 16:53:34 +02:00
Indelog
eb52f5daa0 Add : register donation payment when public payment 
- When we paid a donation whit public link, create the associated payment and
  put its status to payed if all the promised amount is it.

- Set the amount to pay on public page depending to the rest to pay for
  the don.
 2021-04-22 16:32:05 +02:00
Laurent Destailleur
891de3350f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-20 13:30:43 +02:00
Laurent Destailleur
4180a9ef62 FIX pb when saving some export profiles 2021-04-20 13:30:18 +02:00
Laurent Destailleur
74f48d082d
Merge branch 'develop' into fix_rebuild_sequence_for_postgres 2021-04-19 21:46:49 +02:00
Laurent Destailleur
ee9c823c33
Merge pull request #17279 from aspangaro/14a38 
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
 2021-04-19 21:42:13 +02:00
NextGestion
7cab4dd19d Manage partnership for members & code optimisation 2021-04-19 15:17:57 +01:00
NextGestion
5a8742b3eb Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website 2021-04-17 13:25:28 +01:00
NextGestion
f7b1ee9aba Add property "website" on the member card 2021-04-17 13:15:16 +01:00
NextGestion
f784114176 Add email template for accepted partnership 2021-04-16 13:53:12 +01:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership 2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474 Manage mass action "Send email" for Partnership module 2021-04-16 09:54:11 +01:00
Laurent Destailleur
f2bd030f91 Clean code 2021-04-15 19:14:43 +02:00
Alexandre SPANGARO
140f098c79 NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service 2021-04-14 23:16:30 +02:00
Gauthier PC portable 024
9ca67b81f8 FIX : correction migration queries for postgres 2021-04-14 18:49:21 +02:00
Gauthier PC portable 024
4d643db4e6 FIX : travis 2021-04-14 16:14:03 +02:00
Gauthier PC portable 024
a596424328 FIX : Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid 2021-04-14 16:01:48 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership 
Create Partnership Module
 2021-04-13 16:33:54 +02:00
Laurent Destailleur
4bbe02c209
Merge pull request #17223 from atm-gauthier/fix_migration_script 
FIX : UPDATE query must not use alias for postgres compatibility
 2021-04-13 15:37:42 +02:00
Laurent Destailleur
1bae707246 Prepare table for future enhancement 2021-04-13 11:38:37 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer 
new: working on conference or booth object and event type #FoundationFunding
 2021-04-12 16:06:13 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Gauthier PC portable 024
aff07ac13c FIX : UPDATE query must not use alias for postgres compatibility 2021-04-12 14:43:28 +02:00
NextGestion
2035b956a6 Fix Sql & translate files 2021-04-10 10:57:23 +01:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
Dorian Vabre
a590f945e9 thirdparty creation OK, wip on conforboothattendee creation 2021-04-09 16:12:25 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership 2021-04-09 12:01:44 +01:00
Christophe Battarel
4f413ca983 add fk_project to warehouse table 2021-04-08 16:46:52 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership 2021-04-07 12:30:37 +01:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
NextGestion
6da2c47360 Add template email for cancel partnership 2021-04-05 18:13:51 +01:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
NextGestion
21f86c05d4
Merge branch 'develop' into dolibarr_partnership 2021-04-03 09:44:21 +01:00
NextGestion
6cac5f2212 Create Partnership Module 2021-04-03 09:24:07 +01:00
Laurent Destailleur
92da23945b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:51:14 +02:00
Laurent Destailleur
cbbaecd100 Merge branch 'pr_batch_mask' of https://github.com/altairisfr/dolibarr 
into altairisfr-pr_batch_mask

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:49:49 +02:00
Florian HENRY
4cf8c4c685 add conf or booth contact tab and roles 2021-04-02 12:06:03 +02:00
Laurent Destailleur
3d1c47db35 Fix bad table name for migration 2021-04-01 11:28:35 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
cdd3e385e7 Merge branch 'new-propal-signature-date-and-user' of 
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-03-30 19:34:25 +02:00
Laurent Destailleur
c80a8517d4 Fix position of line for ticket group 2021-03-30 17:39:48 +02:00
lvessiller
85fff685db Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:19:54 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Florian HENRY
11dcf656c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 20:30:31 +02:00
Florian HENRY
1f08e37a03 more feature 2021-03-29 20:28:29 +02:00
Christophe Battarel
bbc263f4b3 llx_product batch_mask definition 2021-03-29 18:39:22 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
Florian HENRY
a254bbcc02 fix translation 2021-03-26 19:05:55 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
lvessiller
8a2e49d6e7 NEW date and user signature on proposal (Issue 16062) 2021-03-26 17:44:41 +01:00
Florian HENRY
e898fbb834 almost done 2021-03-24 21:21:53 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Laurent Destailleur
37c04b794f Add property "ticket group is public" in dicitonary of ticket groups. 2021-03-24 12:13:23 +01:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Chl
36baf9b76b FIX #16143 Old PG requires "()" on DROP FUNCTION 
On PostgreSQL 9.6 and previous, the upgrade script fails with a syntax
error if the dropped function's name is not followed by parentheses.

Patch tested on 9.6 and 13.2.
 2021-03-20 11:56:19 +01:00
Laurent Destailleur
7565937a3b
Merge pull request #16820 from bugness-chl/develop 
FIX #16143 Old PG requires "()" on DROP FUNCTION
 2021-03-20 11:55:04 +01:00
Laurent Destailleur
ee84bef3b2
Merge pull request #16828 from frederic34/membersboxfix 
fix new boxes add
 2021-03-20 11:52:19 +01:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
Frédéric FRANCE
7183bfeb94
fix new boxes add 2021-03-19 09:15:35 +01:00
Chl
6cf970df8e FIX #16143 Old PG requires "()" on DROP FUNCTION 
On PostgreSQL 9.6 and previous, the upgrade script fails with a syntax
error if the dropped function's name is not followed by parentheses.

Patch tested on 9.6 and 13.2.
 2021-03-19 03:20:01 +01:00
Laurent Destailleur
27c7950417 Fix migration of boxes 2021-03-18 23:39:19 +01:00
Laurent Destailleur
8d19c57731 Add fields to know authentication method used 2021-03-18 12:54:49 +01:00
Laurent Destailleur
1685e1be79 Fix to keep tms not updated 2021-03-17 12:39:29 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Laurent Destailleur
2129adf129 Add more fields to llx_oauth_token 2021-03-15 13:25:08 +01:00
Laurent Destailleur
8192349320 Fix migration 2021-03-10 16:49:42 +01:00
Laurent Destailleur
2e4a4b527b Fix migration 2021-03-10 16:45:28 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Laurent Destailleur
514a9fb96a
Merge pull request #16561 from Hystepik/develop#1 
Close #15917 : Improvement to ticket module
 2021-03-10 15:49:20 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
28c04a684f Fix position of field 2021-03-08 19:09:02 +01:00
lmarcouiller
b71a8c5d6f Close #15917 : boxes on ticket index 2021-03-08 15:26:35 +01:00
lmarcouiller
8c7764ed5d Move of 2 graph in boxes 2021-03-08 12:18:55 +01:00
Laurent Destailleur
c483ad5dda
Merge branch 'develop' into develop 2021-03-06 11:25:52 +01:00
Laurent Destailleur
74d20e1b1f
Merge pull request #16557 from atm-gauthier/NEW_vatmigration 
NEW : sql migration from llx_tva to llx_payment_vat
 2021-03-06 10:50:59 +01:00
Laurent Destailleur
3ac9829a14
Update 13.0.0-14.0.0.sql 2021-03-06 10:50:27 +01:00
Laurent Destailleur
7a193b4c87 Add index on tag. Reduce tag length 2021-03-05 14:53:13 +01:00
Gauthier PC portable 024
83fa8812f9 NEW : sql migration from llx_tva to llx_payment_vat 2021-03-05 11:41:17 +01:00
Laurent Destailleur
525d643915 Fix debug split of payment salary into salary + payment 2021-03-04 18:57:03 +01:00
Laurent Destailleur
fa03cde0a5 Better migration script 2021-03-04 18:23:29 +01:00
Laurent Destailleur
69f76d2f9d Fix migration to fill llx_salary table 2021-03-04 18:22:21 +01:00
Laurent Destailleur
b92bfb007f
Merge pull request #16520 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-04 17:06:57 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Florian HENRY
c362a16df1 fix sql 2021-03-04 07:45:02 +01:00
Florian HENRY
89bd9c4e05 fix sql 2021-03-04 07:44:31 +01:00
Florian HENRY
879e8fe5f6 fix sql 2021-03-04 07:44:00 +01:00
Florian HENRY
c682309817 migration ok 2021-03-03 20:27:55 +01:00
Florian HENRY
81f54003f6 set migration auto increment 2021-03-02 22:35:47 +01:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Laurent Destailleur
1876cd661a Remove UK from list of european countries 2021-03-02 16:00:10 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
Florian HENRY
036d1d5802 change comlumn name 2021-03-01 15:36:22 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
ca7958f273 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 07:32:23 +01:00
Florian HENRY
d5dc95d99e add status column 2021-02-27 15:36:36 +01:00
Florian HENRY
8bb0ff065a add missing column on actioncomm 2021-02-27 14:19:02 +01:00
Florian HENRY
eb17ae5fe2 fix event type select 2021-02-27 14:13:42 +01:00
Florian HENRY
5e0ca7417e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-02-27 13:16:37 +01:00
Florian HENRY
f13ef50768 set good agenda type event 2021-02-27 13:13:42 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
 2021-02-26 19:23:23 +01:00
Laurent Destailleur
129120523c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:20:10 +01:00
Laurent Destailleur
0315fb5fc3 Fix missing in v13 2021-02-26 19:19:48 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Francis Appels
e12db6d1f1 Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp 2021-02-24 15:20:45 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +01:00
Florian HENRY
c9a51d971d rename column 2021-02-22 21:00:54 +01:00
Alexandre SPANGARO
7f4040e464 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:59:13 +01:00
Alexandre SPANGARO
22c936ba19 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:28:36 +01:00
Laurent Destailleur
f99232e66e
Merge branch 'develop' into 14a21 2021-02-22 11:18:07 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Alexandre SPANGARO
ae4fc565e1 Widget & commonobject 2021-02-22 05:38:31 +01:00
Alexandre SPANGARO
ca4023fe23 Migration 2021-02-22 05:31:01 +01:00
Alexandre SPANGARO
2cd181b86d Code enhanced - Standardize field name #14697 2021-02-21 22:07:58 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
e3419df36e
Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Florian HENRY
be34fb4541 tab event ok 2021-02-21 12:32:16 +01:00
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +01:00
Laurent Destailleur
4b632fb24f
Merge branch 'develop' into 14a19 2021-02-20 17:08:23 +01:00
Laurent Destailleur
7c25f06f58
Merge pull request #16353 from aspangaro/14a18 
Code enhanced - Standardize field name #14697
 2021-02-20 16:51:34 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Alexandre SPANGARO
1017d480f9 Code enhanced - Standardize field name #14697 2021-02-20 07:08:37 +01:00
Laurent Destailleur
69eda9a5c3 Fix migration 2021-02-19 16:16:15 +01:00
Alexandre SPANGARO
042038d185 Code enhanced - Standardize field name #14697 2021-02-18 22:42:55 +01:00
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +01:00
Laurent Destailleur
d183a7eedf
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage 
wip : Event Organization module - PR-1 - setup page  #FoundationFunding
 2021-02-15 15:59:19 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
b2826025f6 Fix missing event type 2021-02-15 11:48:48 +01:00
Laurent Destailleur
67cfa05489 Fix missing event type 2021-02-15 11:48:37 +01:00
Florian HENRY
21a8d4d470 ok for setup pages 2021-02-14 17:06:49 +01:00
Gauthier PC portable 024
23f5c1c1c3 FIX : migration script 2021-02-09 14:28:55 +01:00
Francis Appels
d29fa04930 Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp 2021-02-09 10:51:34 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Laurent Destailleur
d073e809e7 FIX removed no more used proc update_modified_column_date_m on pgsql 2021-02-08 17:32:36 +01:00
Laurent Destailleur
c0aa7e7db5
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects 
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
 2021-02-08 17:19:40 +01:00
Adrien Jussak
ee1a4ee54f FIX #16143 
Remove the function update_modified_column_date_m is required because old triggers can throw errors during PDF generation
 2021-02-08 16:47:46 +01:00
Laurent Destailleur
ea7a0f86f7
Update 13.0.0-14.0.0.sql 2021-02-08 15:34:55 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
Laurent Destailleur
e474ee4d16 Fix add missing field 2021-02-07 21:30:46 +01:00
Frédéric FRANCE
b2ea91e0cc
prefix can be null 2021-02-06 10:46:15 +01:00
Frédéric FRANCE
38863200f2
modules can add prefix for menu 2021-02-06 10:20:35 +01:00
Frédéric FRANCE
df67de08b1
modules can add prefix for menu 2021-02-06 10:16:07 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/delais.php
 2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired 
FIX Bad dates on info tabs
 2021-02-04 11:56:53 +01:00
Florian HENRY
2d77787bba Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly 2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79 no inner join 2021-02-04 09:05:58 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
3b8b0d59ba
Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn 
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
 2021-02-03 20:24:44 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Francis Appels
b685a7549e add newline at end of file 2021-02-02 12:19:34 +01:00
Francis Appels
dae997dd4c Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp 2021-02-02 12:18:19 +01:00
Francis Appels
45970ac443 Update database with new fields 2021-02-02 11:13:14 +01:00
kamel
506ba822e9 FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql 2021-02-02 11:06:01 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
a19eec7791 FIX #16135 2021-02-02 00:41:44 +01:00
Laurent Destailleur
70d04900c1
Several fixes in migration 
Fix we must not drop a field during migration. This must be done 2 or 3 versions later.
Fix syntax of sql
 2021-02-01 19:59:08 +01:00
Gauthier PC portable 024
1eb4968a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 12:00:04 +01:00
Gauthier PC portable 024
f1352fba97 FIX : migration script 2021-02-01 11:56:28 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
2b59a20ce1
Merge pull request #15988 from atm-lena/13.0_FIX_Merge_Societe 
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
 2021-01-30 13:22:00 +01:00
atm-lena
cfca26a727 Fix fix 2021-01-29 16:20:43 +01:00
Gauthier PC portable 024
d364755792 NEW : migration script 2021-01-28 17:20:01 +01:00
Gauthier PC portable 024
8a5588e518 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-28 10:28:36 +01:00
Laurent Destailleur
8a13ad2f26 Close #16075 2021-01-27 19:31:30 +01:00
Gauthier PC portable 024
f3e7adad18 FIX : double quotes on sql file 2021-01-22 16:08:46 +01:00
Gauthier PC portable 024
0b981743aa FIX : remove backquotes 2021-01-22 09:15:45 +01:00
Frédéric FRANCE
c77c5628ca
add another missing undex 2021-01-21 21:35:30 +01:00
Frédéric FRANCE
7888b3d33e
add missing index in extrafields tables of supplier proposal 2021-01-21 21:19:03 +01:00
Laurent Destailleur
cfa593def1 Fix must be foreign key name, not field name. 2021-01-21 13:13:59 +01:00
lmarcouiller
3ab773c510 Fix #16036 Mysql syntax error 2021-01-21 10:51:14 +01:00
Laurent Destailleur
3926d102b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 16:22:38 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
803ae91136 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-19 16:20:19 +01:00
Laurent Destailleur
a81b3a0d61 FIX #15946 2021-01-19 15:23:36 +01:00
Laurent Destailleur
14ef211ed5
Merge pull request #15997 from bb2a/warehouse_on_thirparty 
NEW Add Warehouse affect on Thirparty
 2021-01-19 12:38:33 +01:00
Laurent Destailleur
8e357bf695
Update 13.0.0-14.0.0.sql 2021-01-19 12:37:48 +01:00
Laurent Destailleur
67d9b38e45
No foreign key when field stored for a "defaut value" 2021-01-19 12:30:16 +01:00
Laurent Destailleur
f54efca075 Clean code 2021-01-19 12:25:05 +01:00
Gauthier PC portable 024
b2eca0a314 FIX : VAT declaration list + migration script 2021-01-19 12:02:05 +01:00
Anthony Berton
89ac5e8803 1 2021-01-17 02:09:21 +01:00
atm-lena
e2696d7718 FIX Societe Merge : "unknow column fk_soc" + "Delivery" label 2021-01-15 09:58:04 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2 2021-01-13 17:40:21 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +01:00
Marc de Lima Lucio
759dd379d3 NEW: customer price customer ref: push back to v14 2021-01-12 14:43:09 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5 
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
 2021-01-11 17:10:03 +01:00
Gauthier PC portable 024
8dfb088fc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation 2021-01-11 10:34:38 +01:00
Anthony Berton
d3fa8b9f20 20210110 2021-01-10 01:07:27 +01:00
Laurent Destailleur
0448bf07cb Fix field size 2021-01-08 00:52:26 +01:00
Laurent Destailleur
53da17e051 Add column to count pageview on website module 2021-01-08 00:49:58 +01:00
lmarcouiller
d88adb3d47 move line 553 of 12 to 13 migration to 13 to 14 2021-01-05 18:10:57 +01:00
lmarcouiller
6aa2241617 Merge remote-tracking branch 'doligithub/develop' into develop#2 2021-01-05 18:07:34 +01:00
Marc de Lima Lucio
f03f5701f6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-05 16:01:31 +01:00
ptibogxiv
9be1ce7d20
NEW better date_valid on invoice 
need hour minutes and secondes for better order and search
 2021-01-03 20:25:35 +01:00
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +01:00
Laurent Destailleur
7f0f72ca47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:18 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Frédéric FRANCE
8ad9c3dbe9
fix migration for icstransfert 2021-01-02 09:07:16 +01:00
Laurent Destailleur
3cb71ef53e Code comment 2021-01-01 22:55:22 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction 
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
 2021-01-01 21:36:15 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Alexandre SPANGARO
9eaeab1208 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-28 03:30:41 +01:00
Laurent Destailleur
30d2c8fb56 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-27 15:19:07 +01:00
Laurent Destailleur
f8b179a1be
Merge pull request #15351 from frederic34/patch-13 
separate ref and rowid in members
 2020-12-27 15:18:55 +01:00
Laurent Destailleur
e4d7ce371e Add file for #15351 2020-12-27 15:16:21 +01:00
Laurent Destailleur
4c9a597c8a
Update 12.0.0-13.0.0.sql 2020-12-27 15:13:20 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10 
NEW add db fields note_public note_private for ecm
 2020-12-27 15:07:51 +01:00
Florian HENRY
5ae5f3e7ac let societe project acctioncomme website accounr 2020-12-24 00:32:54 +01:00
Laurent Destailleur
0195c11437 Add missing field required for real funnel of prospection. 2020-12-21 12:58:03 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Laurent Destailleur
812fd22629
Merge branch 'develop' into develop#2 2020-12-15 14:09:29 +01:00
Alexandre SPANGARO
593f5bcb7a Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-15 06:50:22 +01:00
Frédéric FRANCE
1b75ac9ffe
add github 2020-12-12 21:17:18 +01:00
Laurent Destailleur
bfa8383bed Fix migration script 2020-12-12 12:30:13 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
4fa1248d15 Fix avoid duplicate rows after double migration 2020-12-11 16:53:03 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/card.php
 2020-12-08 22:27:27 +01:00
Laurent Destailleur
75b8794d72 Fix column must be NULL 2020-12-08 22:23:24 +01:00
Laurent Destailleur
0f2a8d0262 Fix timestamp field 2020-12-08 17:20:45 +01:00
Alexandre SPANGARO
78dc1eaa83 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-08 13:51:01 +01:00
Hystepik
3d674abfae
Merge branch 'develop' into develop#2 2020-12-08 09:01:20 +01:00
Hystepik
2ac98d06f5
Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Frédéric FRANCE
a2eab824c1
Merge remote-tracking branch 'upstream/develop' into patch-10 2020-12-04 20:42:22 +01:00
Frédéric FRANCE
914d2ae7f7
Merge remote-tracking branch 'upstream/develop' into patch-13 2020-12-04 20:40:35 +01:00
Laurent Destailleur
4ba31ae52e Debug missing column packaging 2020-12-04 19:40:56 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +01:00
Florian HENRY
7a5a6a14f0 fix At install insert shipment mode failed 2020-12-04 09:10:36 +01:00
Alexandre SPANGARO
13f985d280 NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty 2020-12-04 04:13:42 +01:00
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
Hystepik
4830f4a3b4
Merge branch 'develop' into develop#2 2020-12-03 11:05:00 +01:00
lmarcouiller
647294e88e fix #15384 migration 2020-12-03 11:04:24 +01:00
lmarcouiller
e08f6aeb2b Fix #15383 2020-12-03 11:00:29 +01:00
Hystepik
7fc050e3ce
Merge branch 'develop' into develop#3 2020-12-03 10:39:25 +01:00
Laurent Destailleur
56d5cd0402 Fix missing .php into name of boxes added into llx_boxes_def 2020-12-03 10:22:53 +01:00
Hystepik
ecb5a3b028
Merge branch 'develop' into develop#3 2020-12-03 10:12:19 +01:00
lmarcouiller
032116b235 changes to not diplay won and lost and add on migration 2020-12-03 10:11:16 +01:00
Laurent Destailleur
409b73fe2c FIX #15582 2020-12-02 15:16:04 +01:00
lmarcouiller
bca89fc204 add dolibarr_state_board in migration 2020-12-01 15:57:15 +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
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
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
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
2225ff0ba4
Update 12.0.0-13.0.0.sql 2020-11-23 23:59:37 +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
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
87678bff7f
Update 12.0.0-13.0.0.sql 2020-11-10 22:14:37 +01:00
Alexandre SPANGARO
61bca50fa6 NEW: Dictionary for availability - Add column position 2020-11-05 16:56:28 +01: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
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
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
Laurent Destailleur
035325152f Fix migration 2020-10-13 15:02:05 +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
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
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
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
80ec1ad69f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-23 19:29:07 +02: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
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
Cédric
29931bbded
Update 12.0.0-13.0.0.sql 2020-09-12 18:55:26 +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
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8 2020-09-04 23:11:00 +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
Laurent Destailleur
887d4e0603 Add unique key on table of inventory details 2020-08-31 20:02:06 +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
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-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
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
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
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
561520b44c WIP Recruitment module 2020-08-06 16:06:15 +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
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
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
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
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
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
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
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
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
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
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
0041bca82f Fix ambiguous param 2020-05-24 23:49: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