Commit Graph

76462 Commits

Author SHA1 Message Date
ptibogxiv
2d77bfd873
Update product.class.php 2019-08-04 14:50:25 +02:00
ptibogxiv
c9e481d6f7
Update product.class.php 2019-08-04 14:09:59 +02:00
ptibogxiv
f5f6882583
Update product.class.php 2019-08-04 13:42:50 +02:00
ptibogxiv
f7134340e8
Update llx_product.sql 2019-08-04 13:22:01 +02:00
ptibogxiv
c6ab092af1
add capacity value for product 2019-06-14 09:12:53 +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
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
Laurent Destailleur
bf6f9dd7ea Fix phpcs 2019-06-12 13:58:48 +02:00
Laurent Destailleur
44f383c8b9 Fix data lost when creation in error 2019-06-12 13:57:34 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
3ad36a51db
Merge pull request #11312 from aspangaro/10.0_b1
Look and feel v10
2019-06-12 13:11:27 +02:00
Laurent Destailleur
475f59cc2a
Update annuel.php 2019-06-12 13:10:17 +02:00
Laurent Destailleur
9d95812495
Update bankentries_list.php 2019-06-12 13:08:26 +02:00
Laurent Destailleur
509ca489b2
Update card.php 2019-06-12 13:06:02 +02:00
Laurent Destailleur
aaed26b9b0
Update main.lang 2019-06-12 13:04:28 +02:00
Laurent Destailleur
9fa6674e3f
Update list.php 2019-06-12 13:03:54 +02:00
Laurent Destailleur
1e87635e8e
Update sellsjournal.php 2019-06-12 13:02:59 +02:00
Laurent Destailleur
eefd30fe1c
Update purchasesjournal.php 2019-06-12 13:01:04 +02:00
Laurent Destailleur
42915d86ec
Update expensereportsjournal.php 2019-06-12 12:57:02 +02:00
Laurent Destailleur
a400183bf1
Update bankjournal.php 2019-06-12 12:52:51 +02:00
Laurent Destailleur
f435f4bd6a
Update bankjournal.php 2019-06-12 12:49:44 +02:00