Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-11 18:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
95,899 Commits 39 Branches 191 Tags
e8bbef8d2df154afc6cfc6adbea175b7116a69d9
Commit Graph

95899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e8bbef8d2d Update interface_50_modEventOrganization_EventOrganization.class.php 2021-03-11 21:35:22 +01:00
Florian HENRY
6742241639 better tranaction and condition 2021-03-11 16:55:49 +01:00
Florian HENRY
7aec2fc02b create task 2021-03-09 18:52:52 +01:00
Florian HENRY
7234d6dbfd Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-09 18:24:12 +01:00
Florian HENRY
34080b19a1 fix debug 2021-03-09 18:23:57 +01:00
Florian HENRY
3eb72ad833 truc 2021-03-09 17:55:51 +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
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
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
ksar
429992ee7f FIX #16590 2021-03-09 10:46:11 +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
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
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