lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

6398 Commits

Author SHA1 Message Date
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +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
ksar
429992ee7f FIX #16590 2021-03-09 10:46:11 +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
315e66aa5a
Merge pull request #16537 from altairisfr/pr_sn_unicity 
Unique serial number management
 2021-03-06 11:22:44 +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
56cbf04e77
Update llx_accounting_abc.sql 2021-03-06 10:43:01 +01:00
David
ba6d2c3444
Create llx_accounting_account_mx.sql 
Hi, i propose add the 'Catalogo y codigo agrupador fiscal del 2019' it's a list taken from the oficial accounts for the electronic accounting in Mexico indicated by government since 2019
And here is the 'oficial' publication: https://dof.gob.mx/nota_detalle.php?codigo=5559612&fecha=07/05/2019
 2021-03-05 14:14:18 -08:00
David
fd17f80bb6
Update llx_accounting_abc.sql 
Hi, i propose add the 'Catalogo y codigo agrupador fiscal del 2019' it's a list taken from the oficial accounts for the electronic accounting in Mexico indicated by government since 2019
And here is the 'oficial' publication: https://dof.gob.mx/nota_detalle.php?codigo=5559612&fecha=07/05/2019
 2021-03-05 13:34:51 -08: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
Christophe Battarel
a4dcf603ed fix repair batch stock for batch=2 2021-03-04 15:33:06 +01:00
Florian HENRY
ecd1915c0a fix sql 2021-03-04 07:45:27 +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
c2d8dde4b1 Merge branch 'develop' of github.com:FHenry/dolibarr into develop 2021-03-02 22:33:36 +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
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
Laurent Destailleur
7f209f7cc7 Clean code 2021-03-02 02:55:24 +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
Frédéric FRANCE
8548715a18
add experimental repair script to utf8mb4 2021-02-27 15:48:41 +01:00
Florian HENRY
d5dc95d99e add status column 2021-02-27 15:36:36 +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
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
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Laurent Destailleur
338ee6563b
Merge pull request #16463 from frederic34/hrm_code_syntax 
code syntax hrm imports install intracommreport loan directory
 2021-02-26 19:24:03 +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
Frédéric FRANCE
6cef78befb
code syntax hrm imports install intracommreport loan directory 2021-02-26 18:20:21 +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
stickler-ci
eac95a1a29 Fixing style errors. 2021-02-22 14:18:47 +00:00
Frédéric FRANCE
858a65a173
code syntax 2021-02-22 15:18:01 +01:00
Frédéric FRANCE
93aa12a573
remove space and code syntax 2021-02-22 14:41:20 +01:00
Laurent Destailleur
40d23c5082
Update inc.php 2021-02-22 14:15:06 +01:00
BENKE Charlene
8c95bc399a
fix Notice error on install 2021-02-22 13:12:06 +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
e8e6ecb42e
Merge pull request #16352 from aspangaro/14a17 
NEW: Update list of taxes by default for France
 2021-02-19 17:35:19 +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
Alexandre SPANGARO
3f08a9dcde Add IS 2021-02-18 22:08:31 +01:00
Alexandre SPANGARO
8696bebee1 NEW: Update list of taxes by default for France 2021-02-18 22:05:46 +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
Laurent Destailleur
532734a2bb Add regions of TW 2021-02-16 17:45:09 +01:00
Laurent Destailleur
dbe6d43dcd Add states of TW 2021-02-16 17:39:27 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
d02a75e5fc Comment 2021-02-15 20:14:57 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +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
6e21839169 Fix migration 2021-02-15 11:50:59 +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
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Laurent Destailleur
5392e11370 Add missing ethiopian birr currency 2021-02-11 23:05:01 +01:00
Laurent Destailleur
e1334f34b6 Complete repair to clean not correctly available extrafields on proposal 2021-02-11 18:08:01 +01:00
Laurent Destailleur
2615d63024 Complete repair to clean not correctly available extrafields on proposal 2021-02-11 18:02:21 +01:00
Gauthier PC portable 024
23f5c1c1c3 FIX : migration script 2021-02-09 14:28:55 +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
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
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
4aab970e87 FIX : sql migration 2021-02-08 10:36:10 +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
Laurent Destailleur
3dedd81f37 Same width for all picto of menu 2021-02-06 11:56:27 +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
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
Gauthier PC portable 024
8784e5d043 FIX : several merge errors 2021-02-05 11:12:55 +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
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
Laurent Destailleur
217989d0e2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-02 15:37:40 +01:00
Laurent Destailleur
3021c22198 Clean files 2021-02-02 13:49:03 +01:00
Laurent Destailleur
6b32fd33fd Fix export with excell 2021-02-02 13:33:44 +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
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +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
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
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
5adcc3361b FIX : credits 2021-01-28 17:24:47 +01:00
Gauthier PC portable 024
d364755792 NEW : migration script 2021-01-28 17:20:01 +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
Gauthier PC portable 024
f3e7adad18 FIX : double quotes on sql file 2021-01-22 16:08:46 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
ad2f5ea7c1 Update website template 2021-01-22 12:39:59 +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
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
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
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
Laurent Destailleur
250b530b29 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
 2021-01-18 11:07:46 +01:00
Frederick Jost Zweig
267caf7ac8 Added 'US-BASE' and 'CA-ENG-BASE' to models list 
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
 2021-01-18 02:22:23 +01:00
Frederick Jost Zweig
ed796cd500 Removed 'pcg_subtype' column 
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
 2021-01-18 02:22:16 +01:00
Anthony Berton
89ac5e8803 1 2021-01-17 02:09:21 +01:00
Laurent Destailleur
a4109d3fd0
Merge pull request #15600 from Hystepik/develop#2 
Close #15384 : New widget stat database
 2021-01-16 18:42:50 +01:00
Laurent Destailleur
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Laurent Destailleur
c6c7cbf208 Fix trans 2021-01-15 11:21:47 +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
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
8fca2ce2eb Fix field size 2021-01-08 00:52:38 +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
Laurent Destailleur
55b46ca149
Merge pull request #15318 from bafbes/abb120353 
New: add notification on ACTION_CREATE event
 2021-01-07 11:17:33 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +01:00
UT from dolibit
a370ba1bbc Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:53:19 +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
Laurent Destailleur
601d4618d4 Missing vat rates 2021-01-02 14:52:37 +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
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
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +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
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +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
4a8e72c997 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/file_card.php
 2020-12-27 21:00:07 +01:00
Laurent Destailleur
5ff53691a5 Fix migration 2020-12-27 19:13:09 +01:00
Laurent Destailleur
96040980d7 Fix upgrade 2020-12-27 19:06:56 +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
6d1799eb25
Merge branch 'develop' into fixphpcs_2020_12 2020-12-21 18:08:20 +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
Laurent Destailleur
d3bd709ad6 Fix phpcs 2020-12-20 18:51:17 +01:00
Frédéric FRANCE
f9ea75df3d
fix phpcs 2020-12-20 10:28:06 +01:00
Laurent Destailleur
5cbdad7fa7 Fix autofill pass 2020-12-19 16:33:58 +01:00
Laurent Destailleur
9c759e91f0 Fix debug management of docs in ticket module 2020-12-16 19:01:26 +01:00
Laurent Destailleur
e4c853b162 Enable module product batch 2020-12-16 17:00:14 +01:00
Laurent Destailleur
6f75e24fd7 Fix better error management in migration 2020-12-16 15:10:11 +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
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
5778b1f022
Merge pull request #15744 from frederic34/mycompanysocialnetworks 
my company social networks
 2020-12-13 12:54:22 +01:00
Frédéric FRANCE
4c09e14c49
fix sql error 2020-12-13 10:32:23 +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
59938147b6 Prepare v13 2020-12-10 13:38:12 +01:00
Laurent Destailleur
d040f53dc2 Update web templates 2020-12-10 13:02:51 +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
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
 2020-12-03 11:26:53 +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
450aa7cbea
Merge pull request #15597 from dolibit-ut/patch-51 
Update llx_accounting_abc.sql
 2020-12-02 19:47:19 +01:00
Laurent Destailleur
4c8043bd9f
Merge pull request #15598 from dolibit-ut/patch-52 
Update llx_const.sql
 2020-12-02 19:17:31 +01:00
Laurent Destailleur
37b6a15dbb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-02 19:13:44 +01:00
Laurent Destailleur
d88173d7ba Fix bad column 2020-12-02 19:13:32 +01:00
Laurent Destailleur
9d2a78003e
Merge pull request #15606 from Zebedeu/develop 
New add VAT RAT for Angola
 2020-12-02 18:34:32 +01:00
Laurent Destailleur
38b67b0de6
Merge pull request #15616 from dolibit-ut/patch-54 
Update llx_accounting_account_ca.sql
 2020-12-02 18:31:58 +01:00
Laurent Destailleur
409b73fe2c FIX #15582 2020-12-02 15:16:04 +01:00
Marcio Zebedeu
561c7438bc
New Add Angola City name 
Angola province/city support added
 2020-12-02 12:36:15 +01:00
Marcio Zebedeu
73edd081dd
New Support for Angolan currency added 
Support for Region  Angola added
 2020-12-02 12:04:35 +01:00
UT from dolibit
8944670c03
Update llx_accounting_account_ca.sql 
subtype_pcg removed
 2020-12-02 08:28:16 +01:00
Stephane Lesage
1c4876b417 more transporters in llx_c_shipment_mode.sql 2020-12-01 21:17:03 +01:00
Marcio Zebedeu
f7a8a02b98
Update llx_c_tva.sql 2020-12-01 20:07:58 +01:00
Marcio Zebedeu
de9a32972f
New currency for Angolan added 
Support for Angolan currency added
 2020-12-01 19:48:49 +01:00
Marcio Zebedeu
ea1393a7cb
New add VAT RAT for Angola 
VAT rate support for Angola was added.
 2020-12-01 19:29:11 +01:00
lmarcouiller
bca89fc204 add dolibarr_state_board in migration 2020-12-01 15:57:15 +01:00
UT from dolibit
9d1da25f03
Update llx_const.sql 2020-12-01 13:57:33 +01:00
UT from dolibit
f847425f23
Update llx_accounting_abc.sql 2020-12-01 13:48:18 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
 2020-11-29 21:35:03 +01:00
Laurent Destailleur
6a8ddacb33 Prepare database to allow to disconnect other session after a password 
change
 2020-11-29 21:01:57 +01:00
Laurent Destailleur
de98ef1718 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2020-11-29 20:57:43 +01:00
Laurent Destailleur
d45fe6c17f FIx #15551 2020-11-29 20:39:39 +01:00
Laurent Destailleur
fab9b3d50c Fix warning 2020-11-28 18:34:13 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Frédéric FRANCE
1704de39bb
Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-27 11:18:04 +01:00
Frédéric FRANCE
9a2f945807
Merge remote-tracking branch 'upstream/develop' into patch-13 2020-11-27 11:15:10 +01:00
BENKE Charlene
c2bd30a7e9 working progress 2020-11-26 11:59:00 +01:00
BENKE Charlene
c860c0dc4a
Add default BOM 2020-11-26 11:47:45 +01:00
Laurent Destailleur
e1a6e8f2fc CSS 
Security: Add param to fight against Clickjacking attacks
 2020-11-26 11:29:16 +01:00
Laurent Destailleur
d8bf7b2714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
 2020-11-25 18:04:06 +01:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop 
Fix bank transfert supplier
 2020-11-25 13:06:10 +01:00
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-25 12:59:32 +01:00
Florian HENRY
e2b96a834d add SCOP and SCIC in ent form juridique 2020-11-25 12:11:00 +01:00
Florian HENRY
12ef03f06d fix banck tranfert supplier 2020-11-25 10:58:34 +01:00
Jean-Sébastien Pédron
9b1dbf8d2a
llx_accounting_account_fr.sql: Remove left over field data 
In commit 86d9622360, the `pcg_subtype`
was removed from the inserted values.

In commit a85dfaf71e, values associated
with this field were removed. However, at least two lines in the
PCG99-BASE accounting accounts still had that field values.

This led to errors when importing the PCG99-BASE accounts. This patch
fixes the problem and the accounts can be imported successfully.
 2020-11-24 22:19:21 +01:00
Laurent Destailleur
47cfdb4ef2 Prepare database to be ready for a future fix on sessions 2020-11-24 11:38:05 +01:00
Frédéric FRANCE
2225ff0ba4
Update 12.0.0-13.0.0.sql 2020-11-23 23:59:37 +01:00
Frédéric FRANCE
909a723d48
Update llx_ecm_files.sql 2020-11-23 23:57:56 +01:00
Frédéric FRANCE
886945829e
Update llx_ecm_directories.sql 2020-11-23 23:56:03 +01:00
Laurent Destailleur
9004be1df2 Debug feature to send remind by email 2020-11-21 17:42:07 +01:00
Laurent Destailleur
32ae1bf350 Sync transifex 2020-11-18 15:56:06 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
UT from dolibit
1f8a8459fa
Update llx_c_currencies.sql 2020-11-13 11:25:58 +01:00
Laurent Destailleur
b71cd0edea
Merge pull request #15378 from orebd/debug_ticket 
Fix some tickets issue
 2020-11-13 09:58:57 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
Aurélien
d9d32524f7
Fix #14460 2020-11-13 00:36:25 +01:00
Laurent Destailleur
7be3a2267e Add missing vat rates 2020-11-12 22:23:21 +01:00
jcp
10ae18fe44 Update SQL migration 2020-11-12 19:42:20 +01:00
Frédéric FRANCE
1b6dfee2bd
modify sql 2020-11-11 13:56:45 +01:00
Laurent Destailleur
42ea51be49 Fix migration 2020-11-11 07:43:45 +01:00
Frédéric FRANCE
c796d3e3e7
do not reset ref if already entered 2020-11-10 23:10:42 +01:00
Frédéric FRANCE
016c9915ef
Update 12.0.0-13.0.0.sql 
add ref in class

add ref in getNomUrl

add ref on card
 2020-11-10 23:03:03 +01:00
Frédéric FRANCE
22713ae9fb
Update llx_adherent.key.sql 2020-11-10 22:19:21 +01:00
Frédéric FRANCE
87678bff7f
Update 12.0.0-13.0.0.sql 2020-11-10 22:14:37 +01:00
Frédéric FRANCE
8650054c34
Update llx_adherent.sql 2020-11-10 22:11:03 +01:00
Alexandre SPANGARO
82d1f99010 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-11-10 04:09:00 +01:00
jcp
eb0fd1674d Update ICS 2020-11-09 18:40:57 +01:00
bahfir abbes
11099132da New: add notification on ACTION_CREATE event 2020-11-06 00:48:23 +01:00
Laurent Destailleur
529d7ca9cb
Merge pull request #15305 from fappels/13_fix_reception_update 
Fix sql error reception update, tms is auto timestamp
 2020-11-05 19:22:55 +01:00
Regis Houssin
6348a64369 FIX missing rename file date_m to tms 2020-11-05 18:45:30 +01:00
Alexandre SPANGARO
61bca50fa6 NEW: Dictionary for availability - Add column position 2020-11-05 16:56:28 +01:00
Francis Appels
1ca0083eb8 Fix sql error reception update, tms is auto timestamp 
remove deprecated
 2020-11-05 14:30:30 +01:00
Laurent Destailleur
c399721345 Update doc 2020-11-05 09:16:51 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
49ccf2a3cb Update doc 2020-11-01 15:55:51 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
0a9c7fc577 Look and feel v13 2020-10-31 04:19:22 +01:00
Laurent Destailleur
cb3e204281 Fix use of dolibarr_main_distrib 2020-10-30 13:06:55 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Laurent Destailleur
19b82047f0 Fix sql 2020-10-27 10:00:35 +01:00
Laurent Destailleur
07729ec431
Merge pull request #15150 from FHenry/dev_fix_migration_livraison_to_delivery 
fix migration livraison to delivery
 2020-10-26 19:28:59 +01:00
Laurent Destailleur
0abce469e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-26 19:09:08 +01:00
Laurent Destailleur
f18a13b2d4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:08:11 +01:00
Laurent Destailleur
3ee618d736 FIX Clean orphan records in llx_ecm_files into repair script. 2020-10-26 18:31:12 +01:00
Marc de Lima Lucio
f4e63bb046 NEW: ref in product customer price: add fields in database 2020-10-26 10:52:22 +01:00
Florian HENRY
949be12e19 fix migration livraison to delivery 2020-10-25 17:26:15 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Drosis Nikos
6ea9befb48
Add & Update tva for Greece 2020-10-16 15:20:12 +03:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Florian HENRY
a0d1e96bfd fix table creation for intracom and change reserved name column name 2020-10-15 11:37:44 +02:00
Florian HENRY
0597768ea8 fix review 2020-10-15 08:28:38 +02:00
Florian HENRY
50a9bd368c review 2020-10-14 18:15:48 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Florian HENRY
77de8c242c commit add table 2020-10-14 12:24:35 +02:00
Laurent Destailleur
805fa00422 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-13 15:09:24 +02:00
Laurent Destailleur
035325152f Fix migration 2020-10-13 15:02:05 +02:00
Aurélien
abfcb73a45
FIX unkwown columm tms #14947 2020-10-13 12:10:06 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Laurent Destailleur
45e2a6409e Missing field 2020-10-12 11:30:53 +02:00
Laurent Destailleur
b36b9170b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-10 15:45:22 +02:00
Laurent Destailleur
437eead694 Fix bad permission 2020-10-10 15:45:04 +02:00
Alexandre SPANGARO
8876457b54 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-10 06:47:05 +02:00
Francis Appels
4fb83a0dd6 Fix migration 2020-10-09 15:35:09 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Aurélien
3daf530a92
Revert "update dependencies migration12->13.sql #14697" 
This reverts commit 5fa481422a.
 2020-10-08 18:52:17 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Aurélien
5fa481422a
update dependencies migration12->13.sql #14697 2020-10-08 15:56:44 +02:00
Regis Houssin
111f73bd86 FIX add default value of timestamp for avoid error 2020-10-08 12:29:01 +02:00
Laurent Destailleur
4674eda45a Standardize columns comment 2020-10-08 10:13:44 +02:00
Aurélien
9c02390066
fix migration12->13.sql #14697 
fix drop constraint
fix error on update extrafields
 2020-10-07 21:50:54 +02:00
Aurélien
16e076d182
fix UPDATE llx_extrafields.elementtype = livraison to delivery #14697 2020-10-07 20:54:56 +02:00
Laurent Destailleur
c7ca99accb Fix default value of enabled property of menu entry 2020-10-07 15:38:07 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
d103a9aede
rename table on migration #14697 2020-10-06 14:35:27 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
140200213e
change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
Alexandre SPANGARO
d83d9895e0 NEW Vat report - Invert constant to show by default zero vat in reports 2020-10-05 20:52:31 +02:00
Laurent Destailleur
1c34868028 Fix field must be null because there is no numbering ref module yet 2020-10-03 11:16:31 +02:00
Laurent Destailleur
c2fed95dc4 FIX #14877 2020-10-02 19:54:06 +02:00
Frédéric FRANCE
b78e506e39
add files 2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields 2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm 2020-10-02 00:21:13 +02:00
Laurent Destailleur
14736bee63
Merge pull request #14852 from inovea-conseil/newfieldwebsite 
NEW website page fields
 2020-10-01 19:31:14 +02:00
Florian
c89f8b323b Rename fk_typeobject to type_object 2020-10-01 15:18:19 +02:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
29414251f5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2020-09-29 13:19:03 +02:00
Nicolas
dfba9a06ad NEW Field to link website page to an other object 2020-09-28 20:39:02 +02:00
Inovea Conseil
789defa46f Merge remote-tracking branch 'Dolibarr/develop' into newfieldwebsite 2020-09-28 20:08:22 +02:00
Laurent Destailleur
4cf6e483ca Fix export of various payments. 2020-09-28 18:49:20 +02:00
Florian
bdb38da9d3 Add 2 new field typeObject and ObjectId to website 2020-09-28 18:17:23 +02:00
Laurent Destailleur
0dcd85485a Fix migration 2020-09-25 12:36:32 +02:00
Laurent Destailleur
7a9332815c Fix migration 2020-09-25 12:22:24 +02:00
Laurent Destailleur
83bdd530cd Fix sql error in menu edition, column too short 2020-09-25 10:13:45 +02:00
Laurent Destailleur
bc7b5b1468 Update website templates for v13 2020-09-24 21:37:21 +02:00
Laurent Destailleur
80ec1ad69f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-23 19:29:07 +02:00
zecsn
98dc0bbb6e
Reformat comments 2020-09-23 16:53:04 +05:00
zecsn
a4c8a5a69d
Fix SQL Error 
Fix SQL Error DB_ERROR_SYNTAX on Installation
 2020-09-23 16:43:53 +05:00
atm-lena
0fc6e9b84f FIX - Backtick not work with postgresql 2020-09-23 10:54:49 +02:00
Laurent Destailleur
5f4547bf7c Prepare table for future features 2020-09-22 10:38:16 +02:00
Laurent Destailleur
c4ef21a8f2 Increase timeout delay for install 2020-09-21 14:04:46 +02:00
Laurent Destailleur
84cc04a2c6 Increase timeout delay for install 2020-09-21 14:04:07 +02:00
Laurent Destailleur
d38168f49e Fix escape 2020-09-19 22:59:04 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
8029b80f08 Fix install hangs 2020-09-17 13:03:34 +02:00
Laurent Destailleur
b690bab1a8 Fix regression: missing column 2020-09-16 01:06:54 +02:00
Laurent Destailleur
5c31593d43 Add date of birth in candidatures 2020-09-16 00:47:44 +02:00
Laurent Destailleur
1015d3c026
Merge pull request #14716 from 99Deon/develop 
fix bug  in "llx_c_ticket_category.sql"  table .
 2020-09-14 00:17:16 +02:00
Cédric
29931bbded
Update 12.0.0-13.0.0.sql 2020-09-12 18:55:26 +02:00
Cédric
1f5419c883
Update llx_paiement.sql 2020-09-12 18:53:02 +02:00
chkernit
7252022afe
fix problem in table "llx_c_ticket_category.sql" 
when install dolibarr project  the step of creation tables does not completed because there are a bug in create llx_c_ticket_category.sql table .
 2020-09-12 16:33:07 +01:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
05a2fc6186 Fix rate for tunisia 2020-09-10 19:40:03 +02:00
Laurent Destailleur
177ec5eb39 Fix mandatory field 2020-09-09 19:25:16 +02:00
Laurent Destailleur
e439eb636e
Merge pull request #14660 from FHenry/dev_updatedocker 
Update Docker build to new standard (version 3 of docker-compose)
 2020-09-09 15:26:06 +02:00
Laurent Destailleur
86ed4dfa2b Debug hidden option MAIN_USE_EXPENSE_IK 2020-09-08 11:51:36 +02:00
Laurent Destailleur
c91338198d Add some fields in candidature 
Look and feel v13
 2020-09-08 01:53:37 +02:00
Florian HENRY
07242a1c5d Merge branch 'develop' into dev_updatedocker 2020-09-07 15:43:03 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
52fe2a4d96
Merge pull request #14642 from nlouahedj/develop 
NEW Algeria data (tva and forme_juridique)
 2020-09-05 11:36:47 +02:00
Noureddine LOUAHEDJ
8d7bbe3dcb NEW tva Algerie 2020-09-05 08:58:51 +01:00
Noureddine LOUAHEDJ
ebf718fdae NEW forme_juridique Algerie 2020-09-05 08:58:29 +01:00
Laurent Destailleur
84f4020f49
Update llx_facturedet.sql 2020-09-04 23:12:12 +02:00
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8 2020-09-04 23:11:00 +02:00
Cédric
c5fda967c7
add field ref_ext in llx_facturedet 2020-09-04 22:57:21 +02:00
Laurent Destailleur
b2c20c3dfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:42:48 +02:00
Laurent Destailleur
451c878cfc Fix add missing field 2020-09-04 22:42:37 +02:00
Cédric
e9d6e04c25
NEW field ref_ext in llx_commandedet 2020-09-04 21:36:01 +02:00
Cédric
38bc98cf7d
ADD ref_ext field in llx_facturedet 2020-09-04 19:38:24 +02:00
Laurent Destailleur
092b66a7f1 Add variation_ref_ext field 2020-09-04 13:35:16 +02:00
Laurent Destailleur
1ceb7c8677 Add ref_ext to product_attribute. 2020-09-04 12:41:56 +02:00
Laurent Destailleur
5d40380a07 Add index on status 2020-09-01 15:17:52 +02:00
Florian HENRY
0099d98096 Merge remote-tracking branch 'origin/develop' into dev_updatedocker 2020-09-01 14:32:49 +02:00
Laurent Destailleur
887d4e0603 Add unique key on table of inventory details 2020-08-31 20:02:06 +02:00
Florian HENRY
9614dcf9ec fix comment 2020-08-29 18:38:26 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind 
Agenda Remind (Part 1)
 2020-08-29 05:19:21 +02:00
Laurent Destailleur
8e70a731d3 doc 2020-08-29 04:42:14 +02:00
Laurent Destailleur
c6bdd27d4c FIX #14530 2020-08-27 21:52:25 +02:00