ksar
|
429992ee7f
|
FIX #16590
|
2021-03-09 10:46:11 +01:00 |
|
Laurent Destailleur
|
c483ad5dda
|
Merge branch 'develop' into develop
|
2021-03-06 11:25:52 +01:00 |
|
Laurent Destailleur
|
7a193b4c87
|
Add index on tag. Reduce tag length
|
2021-03-05 14:53:13 +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 |
|
Florian HENRY
|
ecd1915c0a
|
fix sql
|
2021-03-04 07:45:27 +01:00 |
|
Florian HENRY
|
879e8fe5f6
|
fix sql
|
2021-03-04 07:44:00 +01:00 |
|
Florian HENRY
|
e5e3abd685
|
class conference or booth or and table actioncomm ok
|
2021-03-02 22:23:54 +01:00 |
|
Florian HENRY
|
0f51072222
|
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2021-03-02 11:01:02 +01:00 |
|
Florian HENRY
|
17c8a32780
|
fix civility createion PK
|
2021-03-02 11:00:16 +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 |
|
Florian HENRY
|
e101ff0d6d
|
change comlumn name
|
2021-03-01 15:34:02 +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
|
5221b59539
|
set correct field name as conference or booth are in actioncomm table
|
2021-02-27 15:34:28 +01:00 |
|
Florian HENRY
|
8bb0ff065a
|
add missing column on actioncomm
|
2021-02-27 14:19:02 +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
|
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 |
|
Laurent Destailleur
|
4b632fb24f
|
Merge branch 'develop' into 14a19
|
2021-02-20 17:08:23 +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 |
|
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
|
bfe71e8509
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-17 14:28:19 +01:00 |
|
Laurent Destailleur
|
0d841ecb1e
|
Reduce field size
|
2021-02-16 19:36:14 +01:00 |
|
Gauthier PC portable 024
|
14f0b225bb
|
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-09 11:27:21 +01:00 |
|
Gauthier PC portable 024
|
9b18b15d8a
|
FIX : several fixes
|
2021-02-09 11:25:30 +01:00 |
|
Francis Appels
|
d29fa04930
|
Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp
|
2021-02-09 10:51:34 +01:00 |
|
Gauthier PC portable 024
|
cd3ac694bb
|
FIX : tables
|
2021-02-09 10:38:35 +01:00 |
|
Gauthier PC portable 024
|
d106fe7e90
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-09 09:50:46 +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 |
|
Laurent Destailleur
|
8041ef641a
|
Merge branch 'develop' into dev_typent_jax_workcorrectly
|
2021-02-08 15:29:36 +01:00 |
|
Gauthier PC portable 024
|
41af1a59f4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-08 10:37:01 +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
|
874c60035f
|
modules can add prefix for menu
|
2021-02-06 10:23:17 +01:00 |
|
Frédéric FRANCE
|
df67de08b1
|
modules can add prefix for menu
|
2021-02-06 10:16:07 +01:00 |
|
Gauthier PC portable 024
|
df8ca1ef84
|
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-05 09:29:20 +01:00 |
|
Gauthier PC portable 024
|
e188ec6cd7
|
NEW : add real payments on salaries objects
|
2021-02-04 17:21:08 +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
|
348fd0fcb5
|
FIX #16160
|
2021-02-03 19:36:10 +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 |
|
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 |
|
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
|
a9d4390a47
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-02-01 11:52:56 +01:00 |
|
Gauthier PC portable 024
|
509e9d597e
|
FIX : table name for VAT payments must be llx_payment_vat
|
2021-02-01 11:47:43 +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 |
|
atm-lena
|
cfca26a727
|
Fix fix
|
2021-01-29 16:20:43 +01:00 |
|
Gauthier PC portable 024
|
5adcc3361b
|
FIX : credits
|
2021-01-28 17:24:47 +01:00 |
|
Gauthier PC portable 024
|
0c43ea1e9b
|
Merge branch 'NEW/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge
|
2021-01-28 17:16:24 +01:00 |
|
Gauthier PC portable 024
|
cce38a9e6d
|
NEW : fk_user on social charge
|
2021-01-28 16:58:55 +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 |
|
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
|
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
|
7472b102e4
|
Fix name of constraints
|
2021-01-19 12:32:37 +01:00 |
|
Laurent Destailleur
|
3033b1d5da
|
Update llx_societe.key.sql
|
2021-01-19 12:30:50 +01:00 |
|
Laurent Destailleur
|
f54efca075
|
Clean code
|
2021-01-19 12:25:05 +01:00 |
|
Gauthier PC portable 024
|
e2abbbcece
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 08:57:24 +01:00 |
|
Gauthier PC portable 024
|
2cfaf5fbd6
|
NEW : add real payments on vat objects
|
2021-01-18 17:08:17 +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
|
aaddda9a6e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/accountancy/class/accountancyexport.class.php
htdocs/user/class/usergroup.class.php
|
2021-01-14 14:13:08 +01:00 |
|
Laurent Destailleur
|
ea60a824ee
|
Comment
|
2021-01-14 11:07:48 +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 |
|
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
|
8fca2ce2eb
|
Fix field size
|
2021-01-08 00:52:38 +01:00 |
|
Laurent Destailleur
|
53da17e051
|
Add column to count pageview on website module
|
2021-01-08 00:49:58 +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 |
|
Alexandre SPANGARO
|
99949c4817
|
Merge remote-tracking branch 'upstream/develop' into 14a5
|
2021-01-03 11:46:20 +01:00 |
|
Laurent Destailleur
|
71e4a672f5
|
Merge branch 'develop' into develop_patch-1
|
2021-01-01 20:52:43 +01:00 |
|
Laurent Destailleur
|
8149478c77
|
Merge pull request #15308 from aspangaro/14a2
NEW: Dictionary for availability - Add column position
|
2020-12-30 13:12:27 +01:00 |
|
Alexandre SPANGARO
|
a843d7fac3
|
Merge remote-tracking branch 'upstream/develop' into 14a5
|
2020-12-29 21:10:25 +01:00 |
|
Alexandre SPANGARO
|
9f0434eb69
|
Merge remote-tracking branch 'upstream/develop' into 14a2
|
2020-12-29 04:50:32 +01:00 |
|
Alexandre SPANGARO
|
5001cfce71
|
NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
|
2020-12-28 04:12:23 +01:00 |
|
Alexandre SPANGARO
|
9eaeab1208
|
Merge remote-tracking branch 'upstream/develop' into 14a5
|
2020-12-28 03:30:41 +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
|
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 |
|
Gauthier PC portable 024
|
5116337e0b
|
FIX : stickler feedbacks
|
2020-12-21 13:29:44 +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 |
|
Alexandre SPANGARO
|
593f5bcb7a
|
Merge remote-tracking branch 'upstream/develop' into 14a5
|
2020-12-15 06:50:22 +01:00 |
|
Frédéric FRANCE
|
4c09e14c49
|
fix sql error
|
2020-12-13 10:32:23 +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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
d88173d7ba
|
Fix bad column
|
2020-12-02 19:13:32 +01:00 |
|
Laurent Destailleur
|
6a8ddacb33
|
Prepare database to allow to disconnect other session after a password
change
|
2020-11-29 21:01:57 +01:00 |
|
Laurent Destailleur
|
de98ef1718
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2020-11-29 20:57:43 +01:00 |
|
Frédéric FRANCE
|
1704de39bb
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-11-27 11:18:04 +01:00 |
|
Frédéric FRANCE
|
9a2f945807
|
Merge remote-tracking branch 'upstream/develop' into patch-13
|
2020-11-27 11:15:10 +01:00 |
|
BENKE Charlene
|
c860c0dc4a
|
Add default BOM
|
2020-11-26 11:47:45 +01:00 |
|
Laurent Destailleur
|
e1a6e8f2fc
|
CSS
Security: Add param to fight against Clickjacking attacks
|
2020-11-26 11:29:16 +01:00 |
|
Frédéric FRANCE
|
c09a6d1435
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-11-25 12:59:32 +01:00 |
|
Florian HENRY
|
12ef03f06d
|
fix banck tranfert supplier
|
2020-11-25 10:58:34 +01:00 |
|
Laurent Destailleur
|
47cfdb4ef2
|
Prepare database to be ready for a future fix on sessions
|
2020-11-24 11:38:05 +01:00 |
|
Frédéric FRANCE
|
909a723d48
|
Update llx_ecm_files.sql
|
2020-11-23 23:57:56 +01:00 |
|
Frédéric FRANCE
|
886945829e
|
Update llx_ecm_directories.sql
|
2020-11-23 23:56:03 +01:00 |
|
Laurent Destailleur
|
9004be1df2
|
Debug feature to send remind by email
|
2020-11-21 17:42:07 +01:00 |
|
Laurent Destailleur
|
32ae1bf350
|
Sync transifex
|
2020-11-18 15:56:06 +01:00 |
|
Aurélien
|
d9d32524f7
|
Fix #14460
|
2020-11-13 00:36:25 +01:00 |
|
Laurent Destailleur
|
42ea51be49
|
Fix migration
|
2020-11-11 07:43:45 +01:00 |
|
Frédéric FRANCE
|
016c9915ef
|
Update 12.0.0-13.0.0.sql
add ref in class
add ref in getNomUrl
add ref on card
|
2020-11-10 23:03:03 +01:00 |
|
Frédéric FRANCE
|
22713ae9fb
|
Update llx_adherent.key.sql
|
2020-11-10 22:19:21 +01:00 |
|
Frédéric FRANCE
|
8650054c34
|
Update llx_adherent.sql
|
2020-11-10 22:11:03 +01:00 |
|
Alexandre SPANGARO
|
82d1f99010
|
Merge remote-tracking branch 'upstream/develop' into 14a2
|
2020-11-10 04:09:00 +01:00 |
|
jcp
|
eb0fd1674d
|
Update ICS
|
2020-11-09 18:40:57 +01:00 |
|
Laurent Destailleur
|
529d7ca9cb
|
Merge pull request #15305 from fappels/13_fix_reception_update
Fix sql error reception update, tms is auto timestamp
|
2020-11-05 19:22:55 +01:00 |
|
Regis Houssin
|
6348a64369
|
FIX missing rename file date_m to tms
|
2020-11-05 18:45:30 +01:00 |
|
Alexandre SPANGARO
|
61bca50fa6
|
NEW: Dictionary for availability - Add column position
|
2020-11-05 16:56:28 +01:00 |
|
Francis Appels
|
1ca0083eb8
|
Fix sql error reception update, tms is auto timestamp
remove deprecated
|
2020-11-05 14:30:30 +01:00 |
|
Laurent Destailleur
|
e0ed89c514
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
|
2020-11-01 17:58:41 +01:00 |
|
Laurent Destailleur
|
49ccf2a3cb
|
Update doc
|
2020-11-01 15:55:51 +01:00 |
|
Marc de Lima Lucio
|
f4e63bb046
|
NEW: ref in product customer price: add fields in database
|
2020-10-26 10:52:22 +01:00 |
|
Florian HENRY
|
949be12e19
|
fix migration livraison to delivery
|
2020-10-25 17:26:15 +01:00 |
|
Laurent Destailleur
|
8578a7cd7c
|
Fix regressions
|
2020-10-25 17:02:25 +01:00 |
|
Laurent Destailleur
|
cd4d738a56
|
Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
|
2020-10-25 16:01:18 +01:00 |
|
Laurent Destailleur
|
64b1a31e45
|
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
NEW : Nature of product is now a dictionay
|
2020-10-15 21:07:42 +02:00 |
|
Laurent Destailleur
|
a1913995df
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/class/expensereport.class.php
|
2020-10-15 21:05:00 +02:00 |
|
Laurent Destailleur
|
e7992131ec
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
|
2020-10-15 21:00:49 +02:00 |
|
Laurent Destailleur
|
6277422115
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/class/expensereport.class.php
|
2020-10-15 20:38:32 +02:00 |
|
Florian HENRY
|
a0d1e96bfd
|
fix table creation for intracom and change reserved name column name
|
2020-10-15 11:37:44 +02:00 |
|
Florian HENRY
|
0597768ea8
|
fix review
|
2020-10-15 08:28:38 +02:00 |
|
Florian HENRY
|
940d478aec
|
UI and db OK
|
2020-10-14 15:54:48 +02:00 |
|
Florian HENRY
|
77de8c242c
|
commit add table
|
2020-10-14 12:24:35 +02:00 |
|
Aurélien
|
abfcb73a45
|
FIX unkwown columm tms #14947
|
2020-10-13 12:10:06 +02:00 |
|
Laurent Destailleur
|
726fd1b631
|
Merge pull request #11227 from aspangaro/10.0_intracommreport
NEW module Intracomm report
|
2020-10-12 13:35:58 +02:00 |
|
Laurent Destailleur
|
45e2a6409e
|
Missing field
|
2020-10-12 11:30:53 +02:00 |
|
Alexandre SPANGARO
|
ca7ad35342
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-10-09 06:39:42 +02:00 |
|
Aurélien
|
b6283c1a5d
|
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
|
2020-10-08 16:19:10 +02:00 |
|
Regis Houssin
|
111f73bd86
|
FIX add default value of timestamp for avoid error
|
2020-10-08 12:29:01 +02:00 |
|
Laurent Destailleur
|
4674eda45a
|
Standardize columns comment
|
2020-10-08 10:13:44 +02:00 |
|
Laurent Destailleur
|
c7ca99accb
|
Fix default value of enabled property of menu entry
|
2020-10-07 15:38:07 +02:00 |
|
Aurélien
|
af7c23b2ac
|
rename folder admin/livraison.php and dependencies #14697
|
2020-10-06 12:05:24 +02:00 |
|
Aurélien
|
140200213e
|
change table into DB and ref #14697
|
2020-10-06 11:04:31 +02:00 |
|
Frédéric FRANCE
|
b78e506e39
|
add files
|
2020-10-02 00:25:44 +02:00 |
|
Florian
|
c89f8b323b
|
Rename fk_typeobject to type_object
|
2020-10-01 15:18:19 +02:00 |
|
Nicolas
|
dfba9a06ad
|
NEW Field to link website page to an other object
|
2020-09-28 20:39:02 +02:00 |
|
Inovea Conseil
|
789defa46f
|
Merge remote-tracking branch 'Dolibarr/develop' into newfieldwebsite
|
2020-09-28 20:08:22 +02:00 |
|
Florian
|
bdb38da9d3
|
Add 2 new field typeObject and ObjectId to website
|
2020-09-28 18:17:23 +02:00 |
|
Laurent Destailleur
|
83bdd530cd
|
Fix sql error in menu edition, column too short
|
2020-09-25 10:13:45 +02:00 |
|
zecsn
|
98dc0bbb6e
|
Reformat comments
|
2020-09-23 16:53:04 +05:00 |
|
zecsn
|
a4c8a5a69d
|
Fix SQL Error
Fix SQL Error DB_ERROR_SYNTAX on Installation
|
2020-09-23 16:43:53 +05:00 |
|
Laurent Destailleur
|
5f4547bf7c
|
Prepare table for future features
|
2020-09-22 10:38:16 +02:00 |
|
Laurent Destailleur
|
b690bab1a8
|
Fix regression: missing column
|
2020-09-16 01:06:54 +02:00 |
|
Laurent Destailleur
|
5c31593d43
|
Add date of birth in candidatures
|
2020-09-16 00:47:44 +02:00 |
|
Laurent Destailleur
|
1015d3c026
|
Merge pull request #14716 from 99Deon/develop
fix bug in "llx_c_ticket_category.sql" table .
|
2020-09-14 00:17:16 +02:00 |
|
Cédric
|
1f5419c883
|
Update llx_paiement.sql
|
2020-09-12 18:53:02 +02:00 |
|
chkernit
|
7252022afe
|
fix problem in table "llx_c_ticket_category.sql"
when install dolibarr project the step of creation tables does not completed because there are a bug in create llx_c_ticket_category.sql table .
|
2020-09-12 16:33:07 +01:00 |
|
Laurent Destailleur
|
177ec5eb39
|
Fix mandatory field
|
2020-09-09 19:25:16 +02:00 |
|
Laurent Destailleur
|
e439eb636e
|
Merge pull request #14660 from FHenry/dev_updatedocker
Update Docker build to new standard (version 3 of docker-compose)
|
2020-09-09 15:26:06 +02:00 |
|
Laurent Destailleur
|
86ed4dfa2b
|
Debug hidden option MAIN_USE_EXPENSE_IK
|
2020-09-08 11:51:36 +02:00 |
|
Laurent Destailleur
|
c91338198d
|
Add some fields in candidature
Look and feel v13
|
2020-09-08 01:53:37 +02:00 |
|
Florian HENRY
|
07242a1c5d
|
Merge branch 'develop' into dev_updatedocker
|
2020-09-07 15:43:03 +02:00 |
|
Laurent Destailleur
|
84f4020f49
|
Update llx_facturedet.sql
|
2020-09-04 23:12:12 +02:00 |
|
Laurent Destailleur
|
02e07c13c8
|
Merge branch 'develop' into patch-8
|
2020-09-04 23:11:00 +02:00 |
|
Cédric
|
c5fda967c7
|
add field ref_ext in llx_facturedet
|
2020-09-04 22:57:21 +02:00 |
|
Laurent Destailleur
|
451c878cfc
|
Fix add missing field
|
2020-09-04 22:42:37 +02:00 |
|
Laurent Destailleur
|
092b66a7f1
|
Add variation_ref_ext field
|
2020-09-04 13:35:16 +02:00 |
|
Laurent Destailleur
|
1ceb7c8677
|
Add ref_ext to product_attribute.
|
2020-09-04 12:41:56 +02:00 |
|
Laurent Destailleur
|
5d40380a07
|
Add index on status
|
2020-09-01 15:17:52 +02:00 |
|
Florian HENRY
|
0099d98096
|
Merge remote-tracking branch 'origin/develop' into dev_updatedocker
|
2020-09-01 14:32:49 +02:00 |
|
Laurent Destailleur
|
887d4e0603
|
Add unique key on table of inventory details
|
2020-08-31 20:02:06 +02:00 |
|
Florian HENRY
|
9614dcf9ec
|
fix comment
|
2020-08-29 18:38:26 +02:00 |
|
Laurent Destailleur
|
b721930b3b
|
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
Agenda Remind (Part 1)
|
2020-08-29 05:19:21 +02:00 |
|
Laurent Destailleur
|
8e70a731d3
|
doc
|
2020-08-29 04:42:14 +02:00 |
|
Laurent Destailleur
|
c6bdd27d4c
|
FIX #14530
|
2020-08-27 21:52:25 +02:00 |
|
Laurent Destailleur
|
8f34f4c1c5
|
FIX #14530
|
2020-08-27 21:46:28 +02:00 |
|
Laurent Destailleur
|
5c1680e9c5
|
Merge branch 'develop' into master
|
2020-08-27 19:58:29 +02:00 |
|