Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,180 Commits 36 Branches 190 Tags
815206cb15d8881e80c8eb2aaba905e77950e92e
Commit Graph

17547 Commits

Author SHA1 Message Date
Eric Seigne
0b3bc5a172 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber 2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287 Debug page to export file 2019-06-17 17:20:22 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Laurent Destailleur
cf82587504 Fix menu entry 2019-06-17 15:02:44 +02:00
Laurent Destailleur
8330078de1 Fix default value 2019-06-17 12:33:09 +02:00
Regis Houssin
3afd4e15ad FIX try to remove ob_* functions 2019-06-17 07:09:19 +02:00
Regis Houssin
908b5fff00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf 2019-06-17 07:08:35 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
Laurent Destailleur
122c4eb8bd Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction 
FIX empty test
 2019-06-14 13:51:34 +02:00
Laurent Destailleur
5cada6ee0b Merge pull request #11336 from ptibogxiv/patch-186 
Fix measuring_units_string display function
 2019-06-14 13:48:31 +02:00
Laurent Destailleur
1fa1b91916 Update product.lib.php 2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db Update product.lib.php 2019-06-14 13:38:52 +02:00
Laurent Destailleur
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
ATM john
e7d81a68f0 Fix Override Attribute 2019-06-13 22:11:47 +02:00
ATM john
0ef9a8843a Fix empty test 2019-06-13 21:57:30 +02:00
ptibogxiv
a30f029bbf Update product.lib.php 2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58 Fix measuring_units_string display function 2019-06-13 20:52:52 +02:00
Laurent Destailleur
7e1eacb7d5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-13 13:26:54 +02:00
Laurent Destailleur
357c5244f7 Fix phpcs 2019-06-13 13:26:35 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-06-13 12:15:51 +02:00
Laurent Destailleur
52159dcb69 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:14:19 +02:00
Laurent Destailleur
3e6b7208cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a Fix syntax error 2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:07:24 +02:00
Laurent Destailleur
4b26702516 code comment 2019-06-13 11:07:38 +02:00
Laurent Destailleur
60e1e89981 Merge pull request #11328 from fappels/clean_10_beta 
Fix scrutinizer bugs
 2019-06-13 10:18:59 +02:00
Laurent Destailleur
ab9742f4df Try to keep proportion of logo 2019-06-13 10:09:20 +02:00
Laurent Destailleur
2bc821d900 Try to keep proportions of logo 2019-06-13 10:08:35 +02:00
Laurent Destailleur
1318e26cda Merge pull request #11298 from hregis/7.0_price 
FIX missing compatibility with multicompany transverse mode
 2019-06-13 10:01:05 +02:00
Laurent Destailleur
4cbfb67d63 Update html.formother.class.php 2019-06-13 09:59:10 +02:00
Francis Appels
3f63be6045 fix typo 2019-06-12 22:10:40 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d Fix look and field v10 2019-06-12 19:03:22 +02:00
Laurent Destailleur
e81663ec34 Fix cropping of image files for BOM module was ko 2019-06-12 19:00:34 +02:00
Laurent Destailleur
c57013f293 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:14 +02:00
Laurent Destailleur
4f5f03b893 Merge pull request #11326 from atm-greg/FIX_massaction_presend 
Fix massaction presend
 2019-06-12 12:37:03 +02:00
Laurent Destailleur
0bf7512f28 Update actions_massactions.inc.php 2019-06-12 12:33:31 +02:00
atm-greg
47746fd17d fix template type 2019-06-12 12:30:49 +02:00
Laurent Destailleur
91a4e8bc0a Merge 2019-06-12 12:09:56 +02:00
atm-greg
9ba102b6b9 bad object used 2019-06-12 12:08:16 +02:00
atm-greg
25031e534d fix massaction presend 2019-06-12 12:05:02 +02:00
Laurent Destailleur
6d5637c389 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/actions_massactions.inc.php
 2019-06-12 12:03:46 +02:00
Laurent Destailleur
afe1ec633b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:21 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab FIX #11316 2019-06-12 10:05:53 +02:00