lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
239e41f6c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-14 13:57:49 +02:00
Laurent Destailleur
1d2c9c9df4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-14 13:57:23 +02:00
Laurent Destailleur
a163623dc6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-14 13:57:17 +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
e6b6246fea
Merge pull request #11334 from atm-florianm/8.0_FIX-print-dictionaries-escape 
FIX: in edit mode, dictionary inputs do not escape the string inside …
 2019-06-14 13:36:06 +02:00
Laurent Destailleur
5bac3d4d2b
Merge pull request #11332 from atm-gauthier/7.0_fix_syntax_error 
FIX : syntax error
 2019-06-14 13:35:40 +02:00
ptibogxiv
c6ab092af1
add capacity value for product 2019-06-14 09:12:53 +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
Laurent Destailleur
ff1adb3934 Fix dead code 2019-06-13 22:11:25 +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
atm-florian.m
787e1319b9 FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes 2019-06-13 16:21:07 +02:00
Laurent Destailleur
53be6492b8 Finish module BOM 2019-06-13 14:20:13 +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
9a5ac7d1c7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-13 12:12:57 +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
b90550f15a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-13 11:07:52 +02:00
Laurent Destailleur
4b26702516 code comment 2019-06-13 11:07:38 +02:00
Laurent Destailleur
0ef4ee3f99 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-13 11:07:19 +02:00
Laurent Destailleur
04a085e4f7 Update doc 2019-06-13 11:07:08 +02:00
gauthier
28218a00b3 FIX : syntax error 2019-06-13 11:01:12 +02:00
Laurent Destailleur
13cbe585d1
Merge pull request #11329 from fappels/develop_scrutinizer 
Fix scrutinizer
 2019-06-13 10:20:33 +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
989cf823dd Fix scrutinizer 2019-06-12 22:55:08 +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
d4aa0bfa94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-12 15:42:58 +02:00
Laurent Destailleur
47610d0323 Look and feel v10 2019-06-12 15:42:48 +02:00
Laurent Destailleur
c0949e3cf9
Merge pull request #11175 from aspangaro/10.0_Differentiated_export 
NEW Accountancy - Differentiated export
 2019-06-12 15:42:20 +02:00
Francis Appels
1688bc3f7e Merge branch '10' into clean_10_beta 2019-06-12 14:38:25 +02:00
Laurent Destailleur
a7e0589071 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:22 +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