Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 02:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
96,016 Commits 36 Branches 190 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

9249 Commits

Author SHA1 Message Date
Frédéric FRANCE
923a5fe2a5 Merge remote-tracking branch 'upstream/develop' into davadmin 2021-01-13 18:45:29 +01:00
Laurent Destailleur
43161be711 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-13 17:45:38 +01:00
Laurent Destailleur
0af5c9ae91 Fix phpcs 2021-01-13 17:45:17 +01:00
Frédéric FRANCE
40a45efb63 fix code 2021-01-13 16:23:54 +01:00
Frédéric FRANCE
cb7266d261 fix trans 2021-01-13 16:18:23 +01:00
Laurent Destailleur
b7402ecf3f Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Laurent Destailleur
015c5a028b Doxygen 2021-01-13 12:45:23 +01:00
Laurent Destailleur
1571b0496c Merge pull request #15794 from atm-gauthier/develop_new_workstation 
NEW : Workstations management
 2021-01-13 12:19:38 +01:00
Frédéric FRANCE
e2c57584b7 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-12 23:47:24 +01:00
Frédéric FRANCE
dad329602a Update html.formmail.class.php 2021-01-12 23:46:29 +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
2e9f3b803d Add some hooks to add new buttons (compensation of removal of tabs). 
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
 2021-01-12 13:59:20 +01:00
Florian HENRY
98eff62aff Merge branch '13_backport' into dev_fix_contact_bulk 2021-01-12 10:25:18 +01:00
Florian HENRY
e34a797899 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_backport 2021-01-12 10:21:35 +01:00
Laurent Destailleur
3906acc951 Must use the generic version 2021-01-12 10:00:05 +01:00
Florian HENRY
21e1d5c8c9 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab 2021-01-11 18:07:10 +01:00
Laurent Destailleur
c2187b2ff1 Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
238fd5accb Merge pull request #15346 from ATM-Consulting/FIX_12.0_date_extrafields_are_not_filterable_on_lists 
NEW Can filter on extrafields date on lists
 2021-01-11 16:41:01 +01:00
Laurent Destailleur
9962c182c4 Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr 
NEW : Extrafields of documents lines are inside the lines, not any more on separate TR
 2021-01-11 16:15:45 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Gauthier PC portable 024
6668cfa311 FIX : name in copyrights 2021-01-11 11:40:04 +01:00
Gauthier PC portable 024
e3e4f0590c FIX : get and delete linked items with association tables methods created in common object 2021-01-11 11:36:19 +01:00
Florian Mortgat
6a759b4bd0 Merge branch 'refs/heads/develop' into FIX_12.0_date_extrafields_are_not_filterable_on_lists 2021-01-08 09:21:58 +01:00
Florian Mortgat
77933de467 Merge branch '12.0' into FIX_12.0_date_extrafields_are_not_filterable_on_lists 2021-01-08 09:08:52 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Laurent Destailleur
26fa8b45ac Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +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
4f55d51eac Merge pull request #15886 from FHenry/dev_add_column_propal_order 
NEW : Column shippement method, payment mode, payment term in propal and order list
 2021-01-07 11:04:30 +01:00
Laurent Destailleur
3d2dc59468 Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment 
NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
 2021-01-07 10:49:06 +01:00
Laurent Destailleur
a1d20ed9c2 Merge pull request #15910 from atm-john/new/unit_type_selection_limit 
NEW unit selection on object edit line
 2021-01-07 10:33:07 +01:00
Laurent Destailleur
c2855d4d71 Update html.form.class.php 2021-01-07 10:32:23 +01:00
Frédéric FRANCE
1e8362575a Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-06 21:05:59 +01:00
ATM john
dd19da66b2 fix stickler 2021-01-06 17:33:19 +01:00
ATM john
ae7b8e7f5e Fix unit selection on object edit line 2021-01-06 15:15:51 +01:00
Regis Houssin
f80a476bc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-06 11:37:56 +01:00
kamel
32109de67b NEW : Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked() 2021-01-06 11:14:13 +01:00
Florian HENRY
6e7172887a Merge branch '13_backport' into dev_add_column_propal_order 2021-01-05 22:58:00 +01:00
Florian HENRY
b9bb48a01f better place and noadmininfo 2021-01-05 22:50:54 +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
Florian HENRY
f953ff0334 fix sticker 2021-01-05 15:25:47 +01:00
Florian HENRY
a2a45c6aa0 fix sticker 2021-01-05 15:22:31 +01:00
Florian HENRY
27c32560c6 Merge develop 2021-01-05 14:46:50 +01:00
Laurent Destailleur
a93227ac2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Regis Houssin
ec6c14beb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-05 09:41:52 +01:00
Laurent Destailleur
7efd8add39 Merge pull request #15878 from frederic34/patch-10 
doxygen
 2021-01-05 01:41:02 +01:00
Frédéric FRANCE
eeaac549e2 doxygen 2021-01-05 00:11:19 +01:00
Frédéric FRANCE
c468db5a7c doxygen 2021-01-04 23:41:20 +01:00
Florian HENRY
86075a4db9 review code 2021-01-04 20:00:57 +01:00