Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
99,661 Commits 36 Branches 189 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

24418 Commits

Author SHA1 Message Date
Laurent Destailleur
4b45c5e723 Trans 2021-01-05 12:29:13 +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
Laurent Destailleur
40645ea24d Fix load lang 2021-01-05 10:39:53 +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
Florian HENRY
88ff52a82b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-04 19:20:34 +01:00
Frédéric FRANCE
8454100e7a Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-04 17:45:36 +01:00
Laurent Destailleur
c58451dbb6 Code comment 2021-01-04 16:07:54 +01:00
Laurent Destailleur
07a3367f52 Merge pull request #15624 from StephaneLesage/edit-extrafield-computed-multiline 
Create/Edit extra-field computed value with multi-line text area
 2021-01-04 15:57:50 +01:00
Laurent Destailleur
e488f94af3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-04 15:39:48 +01:00
Laurent Destailleur
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Laurent Destailleur
b3142c3250 Merge pull request #15859 from frederic34/htmlformmail_doxygen 
doxygen
 2021-01-04 14:08:51 +01:00
Laurent Destailleur
4d09d3a576 Merge pull request #15860 from fappels/13_debug_shipments 
Some debug on Shipments and reception.
 2021-01-04 14:06:52 +01:00
Laurent Destailleur
ef76c067e0 Add limit to 25000 2021-01-04 13:37:21 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
5c104e344c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/ticket/list.php
 2021-01-04 12:17:59 +01:00
Laurent Destailleur
66bd040d2c Fix regression 2021-01-04 12:08:14 +01:00
Laurent Destailleur
bb22f2ccaf Update admin.lib.php 2021-01-04 12:02:41 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Maxime Kohlhaas
e190b010d3 Fix dict contact type element list 2021-01-03 16:05:04 +01:00
Laurent Destailleur
645b7694c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
 2021-01-03 15:26:31 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
f462f68056 Code comment 2021-01-03 15:10:33 +01:00
Alexandre SPANGARO
43423650cd NEW: Accountancy - Add closure menu in auguria menu 2021-01-03 11:57:40 +01:00
Alexandre SPANGARO
a8ecea1a89 NEW: Accountancy - Add closure menu in stable version 2021-01-03 11:54:50 +01:00
Frédéric FRANCE
7291bf34f0 boxes 2021-01-02 22:29:23 +01:00
Frédéric FRANCE
dc6c1b8d3b boxes 2021-01-02 22:12:19 +01:00
Frédéric FRANCE
bd762bc58f boxes 2021-01-02 21:50:58 +01:00
Frédéric FRANCE
8f3e6df3e1 transform into box 2021-01-02 21:03:04 +01:00
Frédéric FRANCE
96fbee5eaf transform into box 2021-01-02 21:01:47 +01:00
Frédéric FRANCE
5dd0b3b1c6 can add box on user home page 2021-01-02 20:20:22 +01:00
Frédéric FRANCE
6fad38db57 can add box on member index page 2021-01-02 20:04:40 +01:00
Florian HENRY
b6d91526ee Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-02 17:58:34 +01:00
Francis Appels
ade0e008e9 Some debug on Shipments. 
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
 2021-01-02 17:42:33 +01:00
Regis Houssin
3b7f5a92cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 17:20:24 +01:00
Frédéric FRANCE
eb937f82c8 doxygen 2021-01-02 16:58:05 +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
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Regis Houssin
e36ae4ac90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 13:14:30 +01:00
Frédéric FRANCE
b71e837ddd clean code 2021-01-02 10:18:58 +01:00
Frédéric FRANCE
2894dac221 clean code 2021-01-02 10:17:11 +01:00
Frédéric FRANCE
5e692fa9db doxygen 2021-01-02 09:47:29 +01:00
Frédéric FRANCE
4643e41282 remove unused code 2021-01-02 09:35:57 +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