lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,005 Commits 43 Branches 150 Tags 886 MiB
5f0249894d
Commit Graph

84618 Commits

Author SHA1 Message Date
Laurent Destailleur
2ff2640c8d
Update card.php 2021-03-10 17:16:49 +01:00
Laurent Destailleur
13d8807bb4
Merge pull request #16606 from tuxgasy/mo_allow_kits_option 
Add hidden option ALLOW_USE_KITS_INTO_BOM_AND_MO
 2021-03-10 17:05:45 +01:00
Laurent Destailleur
82d5c7289d Add property widgettype 2021-03-10 17:02:39 +01:00
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop 
Update fork
 2021-03-10 16:53:35 +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
521e3b20dc Rename widget 2021-03-10 16:44:46 +01:00
Damien BENOIT
93675082d7
Update html.form.class.php 2021-03-10 16:42:14 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
stickler-ci
d5e6f54b5c Fixing style errors. 2021-03-10 15:33:53 +00:00
Givriz
6e46396b17 Ajout de picto pour le genre et la civilité 2021-03-10 16:31:50 +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
Frédéric FRANCE
204302ac15
replace value with constant 2021-03-10 15:43:50 +01:00
Damien BENOIT
628d434823
Merge pull request #10 from Dolibarr/develop 
Update fork
 2021-03-10 15:42:49 +01:00
Adrien Raze
6a7ecf210f FIX : Travis returns 2021-03-10 15:38:01 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
 2021-03-10 15:35:09 +01:00
Laurent Destailleur
fbe5ec8bb2 Complete test on setup 2021-03-10 13:12:28 +01:00
Laurent Destailleur
9a13ebfdb8 Fix look and feel v13 2021-03-10 11:08:39 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
stickler-ci
a9a8a177a2 Fixing style errors. 2021-03-10 09:54:43 +00:00
Laurent Destailleur
a0c7c6bad9 Fix selection of accounting account 2021-03-10 10:45:01 +01:00
TuxGasy
3a3793d509 Add hidden option ALLOW_USE_KITS_INTO_BOM_AND_MO 2021-03-10 10:24:20 +01:00
Laurent Destailleur
b1f4c29fde Fix missing alias 2021-03-09 20:12:14 +01:00
Laurent Destailleur
28f54eeb75 Fix translation 2021-03-09 19:55:47 +01:00
Laurent Destailleur
67f5837072 Fix permission to create a holiday when advanced permissions are set 2021-03-09 19:51:11 +01:00
Laurent Destailleur
8babacfe55 Look and feel v14 2021-03-09 19:10:41 +01:00
Florian HENRY
7aec2fc02b create task 2021-03-09 18:52:52 +01:00
Laurent Destailleur
e82e812c36 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-09 17:01:53 +01:00
Laurent Destailleur
5b74fefb60 Fix look and feel v13 2021-03-09 17:01:20 +01:00
Laurent Destailleur
b778820fe2
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList 
Dev allow alias in common object get filed list
 2021-03-09 16:54:22 +01:00
Laurent Destailleur
5e68eee407 Fix filter 2021-03-09 16:47:38 +01:00
Laurent Destailleur
9cb4dce485 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing 2021-03-09 16:12:30 +01:00
Laurent Destailleur
1fe90091b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-09 15:35:25 +01:00
Laurent Destailleur
cf30e90b93 Work on inventory 2021-03-09 15:35:10 +01:00
Laurent Destailleur
6b37d392a8
Merge pull request #16597 from ksar-ksar/develop 
FIX #16590
 2021-03-09 15:14:31 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php 2021-03-09 15:13:20 +01:00
Laurent Destailleur
f3508eed83
Update card.php 2021-03-09 15:09:28 +01:00
Laurent Destailleur
b822f04cbb
Merge pull request #16593 from frederic34/patch-3 
fix unknown variable
 2021-03-09 15:08:11 +01:00
Laurent Destailleur
1b3aae1984 Fix regression 2021-03-09 12:17:32 +01:00
stickler-ci
93e50bcba6 Fixing style errors. 2021-03-09 10:50:59 +00:00
Adrien Raze
b82f14859c FIX : no fetch required 2021-03-09 11:48:25 +01:00
stickler-ci
1afddabed4 Fixing style errors. 2021-03-09 10:41:03 +00:00
Adrien Raze
07015ef29e FIX : Using function getSommePaiement() instead of using SQL request 2021-03-09 11:35:24 +01:00
stickler-ci
c55c1ab854 Fixing style errors. 2021-03-09 09:58:11 +00:00
Adrien Raze
a67fd6c0a4 FIX : Update pencil should be shown only when no payments has been entered 2021-03-09 10:55:10 +01:00
ksar
429992ee7f FIX #16590 2021-03-09 10:46:11 +01:00
Laurent Destailleur
53f8ff060a Fix phpcs 2021-03-09 10:40:22 +01:00
Florian HENRY
ce5324c08c Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList 2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a allow table alias into commonObject getFieldList 2021-03-09 10:21:32 +01:00
Frédéric FRANCE
de1cf54e2f
Update box_members_by_type.php 2021-03-09 00:20:28 +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
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Laurent Destailleur
bada3afebb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-08 19:18:26 +01:00
Laurent Destailleur
28c04a684f Fix position of field 2021-03-08 19:09:02 +01:00
stickler-ci
5294e10ecf Fixing style errors. 2021-03-08 18:07:15 +00:00
Laurent Destailleur
14d6893c63 Complete fields of product 2021-03-08 18:56:32 +01:00
Givriz
fb54f6912c feature #16570 
Ajout de picto pour le genre et la civilité
 2021-03-08 18:37:03 +01:00
stickler-ci
cb5d532665 Fixing style errors. 2021-03-08 16:24:54 +00:00
Adrien Raze
946a1fe82d Merge branch 'NEW/12.0_new_payments_on_salaries' of https://github.com/ATM-Consulting/dolibarr into FIX/salaries_card 2021-03-08 17:12:48 +01:00
Laurent Destailleur
a3896bd237 Restore default tabs 2021-03-08 16:47:49 +01:00
Laurent Destailleur
3b80b9dd75 Fix regression 2021-03-08 16:37:52 +01:00
Laurent Destailleur
146b57700c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-08 16:34:32 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex 2021-03-08 16:34:05 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation 
FIX : Add "Now" link on social charges creation card
 2021-03-08 16:31:41 +01:00
Laurent Destailleur
8b555d33e7
Merge pull request #16586 from atm-adrien/FIX/rouding_socialesCard_amount_on_card_updating 
FIX : Rounding amount on social charges card updating
 2021-03-08 16:30:53 +01:00
Laurent Destailleur
20c30bade8
Update card.php 2021-03-08 16:30:32 +01:00
Laurent Destailleur
f3486e49fa CSS 2021-03-08 16:28:39 +01:00
Laurent Destailleur
24a0700426
Merge pull request #16573 from frederic34/box_index_societe 
can add box on thirparties index
 2021-03-08 16:25:46 +01:00
Laurent Destailleur
870e0e77de
Merge pull request #16579 from ptibogxiv/patch-417 
Fix get thirdparties by barcode or email
 2021-03-08 16:23:38 +01:00
Laurent Destailleur
3b9f38caa1
Update api_thirdparties.class.php 2021-03-08 16:22:26 +01:00
Laurent Destailleur
77b60d4d1c
Update api_thirdparties.class.php 2021-03-08 16:20:15 +01:00
Laurent Destailleur
33cd0ae04e
Merge pull request #16580 from frederic34/patch-5 
Do not return specimen if searching empty string value
 2021-03-08 16:18:10 +01:00
Laurent Destailleur
66e7a9b283 NEW API Add option $includeifobjectisused to get a product 2021-03-08 16:17:20 +01:00
Laurent Destailleur
e3c31aa7b3
Merge pull request #16576 from c3do/patch-19 
NEW API Get the list of product ids only
 2021-03-08 16:08:30 +01:00
Laurent Destailleur
6367b843c3
Update api_products.class.php 2021-03-08 16:08:18 +01:00
Laurent Destailleur
67211d24fb
Update api_products.class.php 2021-03-08 16:07:30 +01:00
Laurent Destailleur
263605a11f
Merge pull request #16578 from frederic34/patch-4 
fix usage of else if
 2021-03-08 16:04:37 +01:00
Laurent Destailleur
06affc61be
Merge pull request #16582 from atm-gauthier/FIX_salaries2 
Fix useless num_payment on llx_salary
 2021-03-08 16:04:23 +01:00
Laurent Destailleur
1aba0c2bc9 NEW Can set order of execution of hooks 2021-03-08 15:56:41 +01:00
Adrien Raze
67c6577177 FIX : Add "Now" link on social charges card creation 2021-03-08 15:47:02 +01:00
lmarcouiller
b71a8c5d6f Close #15917 : boxes on ticket index 2021-03-08 15:26:35 +01:00
Laurent Destailleur
7bd93aa3ad Fix price format 2021-03-08 14:31:02 +01:00
Laurent Destailleur
8184e34de4
Merge pull request #16587 from ATM-Consulting/NEW/12.0_new_payments_on_vat 
FIX : Rounding amount on VAT card updating
 2021-03-08 14:29:29 +01:00
atm-gauthier
23f913ee86
Merge pull request #171 from atm-adrien/NEW/12.0_new_payments_on_salaries_rounding-amount 
FIX : Rounding amount on card updating
 2021-03-08 14:05:31 +01:00
lmarcouiller
d8a74bad93 update for continuous integration 2021-03-08 13:58:23 +01:00
Laurent Destailleur
4ad24dd665
Merge pull request #16584 from hregis/fix_missing_user_get_rights 
FIX missing user get rights
 2021-03-08 13:48:42 +01:00
stickler-ci
66230c3f24 Fixing style errors. 2021-03-08 12:27:24 +00:00
Cédric
01db1161b6
Update api_products.class.php 2021-03-08 13:25:31 +01:00
Cédric
15fe2a7205
indicate if the product is used 2021-03-08 13:25:01 +01:00
lmarcouiller
8c7764ed5d Move of 2 graph in boxes 2021-03-08 12:18:55 +01:00
Cédric
5fc5d9ab48
Update api_products.class.php 2021-03-08 12:12:29 +01:00
Laurent Destailleur
89066e50f8 css 2021-03-08 12:07:01 +01:00
Adrien Raze
cbb7751a15 FIX : rounding amount on card updating 2021-03-08 11:51:18 +01:00
Laurent Destailleur
9d8ec0441b css 2021-03-08 11:43:03 +01:00
x
e087c6ffe0 FIX : Rounding amount on card updating 2021-03-08 11:35:59 +01:00
Regis Houssin
4f4829ea70 FIX missing user get rights 2021-03-08 11:33:37 +01:00
Laurent Destailleur
ab89d85095 Fix for php8 2021-03-08 11:33:07 +01:00
x
1fec98c546 FIX : Rounding amount on card updating 2021-03-08 11:10:51 +01:00
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +01:00
Florian Mortgat
c73dbebd8f
Merge pull request #169 from atm-adrien/NEW/12.0_new_payments_on_salaries_devadrien 
FIX : pencil to update employee field on card view
 2021-03-08 10:31:51 +01:00