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

3563 Commits

Author SHA1 Message Date
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00:00 +02:00
Alexandre SPANGARO
24e3dd0992 Prepare sql 2021-10-07 06:05:36 +02:00
Laurent Destailleur
ec545f8967 Fix data 2021-10-07 02:58:51 +02:00
Laurent Destailleur
89b2ecf504 Add missing migration sql 2021-10-06 13:28:05 +02:00
Marc de Lima Lucio
b173832d54 NEW: deposit payment terms: add a 30% deposit example payment term at install/migration 2021-10-05 15:42:40 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Laurent Destailleur
1c56f65c27 Fix missing migration instruction 2021-10-04 11:49:49 +02:00
Laurent Destailleur
2f813e0b6a
Merge pull request #18832 from atm-gauthier/NEW/integration_GPEC_sql 
NEW : integration HRM sql and migration files
 2021-10-02 21:18:50 +02:00
Frédéric FRANCE
87cbc2b555
Update 14.0.0-15.0.0.sql 2021-10-01 08:24:40 +02:00
Gauthier PC portable 024
433132de9a FIX : llx_hrm_position > llx_hrm_job_user 2021-10-01 07:49:31 +02:00
Marc de Lima Lucio
78b593c067 FIX: leave request block moved to v15 2021-09-30 17:42:59 +02:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Marc de Lima Lucio
ab48351d15 NEW: deposit payment terms: database fields 2021-09-29 11:10:58 +02:00
Gauthier PC portable 024
419ff967e3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_sql 2021-09-29 07:52:13 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
f9913d2ebc
Merge branch 'develop' into develop#4 2021-09-28 13:21:43 +02:00
Laurent Destailleur
bde8ba300a
Merge pull request #18827 from aspangaro/15a21 
NEW #18814 Add legal form for Sweden
 2021-09-28 12:42:35 +02:00
Laurent Destailleur
ec3154075a Comment 2021-09-27 22:16:08 +02:00
Laurent Destailleur
fa57191702 Fix regressions 2021-09-27 20:09:43 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Gauthier PC portable 024
07bdc534db NEW : integration HRM sql and migrations files 2021-09-27 10:34:31 +02:00
Alexandre SPANGARO
b7c577b762 NEW #18814 Add legal form for Sweden 2021-09-26 05:17:03 +02:00
Laurent Destailleur
a47cd22450 Fix sql 2021-09-25 21:15:53 +02:00
Laurent Destailleur
efa6e8a408 Fix sql 2021-09-25 21:15:21 +02:00
Laurent Destailleur
567334318a Fix sql eventorganization 2021-09-25 21:13:55 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
lmarcouiller
7361941420 Close #18770 : Can enter buying price on line 2021-09-22 14:56:44 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
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