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

95883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
cf30e90b93 Work on inventory 2021-03-09 15:35:10 +01:00
Laurent Destailleur
1b3aae1984 Fix regression 2021-03-09 12:17:32 +01:00
Laurent Destailleur
78588f24b9 Move git hooks pre-commit into dev/setup dir 2021-03-09 10:42:59 +01:00
Laurent Destailleur
53f8ff060a Fix phpcs 2021-03-09 10:40:22 +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
Laurent Destailleur
14d6893c63 Complete fields of product 2021-03-08 18:56:32 +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
1980ce3b95
Merge pull request #15862 from frederic34/boxindex 
can add box on member index page and user home
 2021-03-08 16:34:13 +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
5c7685c1b8
Merge pull request #16581 from frederic34/patch-7 
Do not return specimen if searching empty string value
 2021-03-08 16:29:04 +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
284f23a9c9
Merge pull request #16572 from frederic34/patch-3 
fix phpunit
 2021-03-08 16:05:14 +01:00
Laurent Destailleur
669a863353
Merge branch 'develop' into patch-3 2021-03-08 16:05:05 +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
fe7fa49b37
Merge pull request #16583 from ksar-ksar/13.0 
FIX : #16341 : Fetch the Product ExtraFields in Shippment lines
 2021-03-08 16:03:40 +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
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
e0ddb61074
Merge pull request #172 from atm-adrien/NEW/12.0_new_payments_on_vat_rounding-amount 
FIX : Rounding amount on card updating
 2021-03-08 14:05:27 +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
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
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +01:00