Commit Graph

75558 Commits

Author SHA1 Message Date
ATM john
41e597e739 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools 2020-04-27 17:46:22 +02:00
Laurent Destailleur
6b1a1e5e58 FIX #13743 2020-04-27 15:09:27 +02:00
Laurent Destailleur
a1142f884d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-27 15:03:34 +02:00
Laurent Destailleur
581d4dbcd9 Look and feel v12 2020-04-27 14:39:38 +02:00
Laurent Destailleur
50d9f466d4 FIX #13749 2020-04-27 14:38:45 +02:00
stickler-ci
fdc0543b4d Fixing style errors. 2020-04-27 12:16:24 +00:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
d8ba28185a
Merge pull request #13706 from leninrivas/develop
Cancel shipping
2020-04-27 14:06:39 +02:00
Laurent Destailleur
fe3359022a
Merge pull request #13747 from bb2a/patch-7
Link Phone in list
2020-04-27 13:49:30 +02:00
Laurent Destailleur
a7de160290
Merge pull request #13740 from simicar29/develop-hook-updateTotalPrice
ADD: New hook updateTotalPrice in commonObject update_price
2020-04-27 13:43:13 +02:00
Laurent Destailleur
3c1d989c30 FIX #13751 2020-04-27 11:41:35 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
31ba277da7 Fix phpcs 2020-04-26 23:18:09 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
a36d0c96c1 Fix sql 2020-04-26 22:28:43 +02:00
Laurent Destailleur
06cb0194d5 Look and feel v12 2020-04-26 14:12:51 +02:00
Laurent Destailleur
58409ce93e Look and feel v12 2020-04-26 14:11:25 +02:00
Anthony Berton
62ca9a984e
Update list.php 2020-04-25 21:42:59 +02:00
Laurent Destailleur
1d68510c7d Fix syntax error 2020-04-25 19:32:18 +02:00
Laurent Destailleur
6caa872280 Enable more PHPCS rules 2020-04-25 19:27:42 +02:00
Laurent Destailleur
068a890c36 Enable more PHPCS rules 2020-04-25 19:13:20 +02:00
Laurent Destailleur
b426bbe758 Fix bad code 2020-04-25 17:47:41 +02:00
Laurent Destailleur
3090eb578b Look and feel v12 2020-04-25 17:43:12 +02:00
Laurent Destailleur
0aec776d82
Merge pull request #13737 from lecoqlibre/develop
FIX CUnit->fetch id/rowid
2020-04-25 13:53:16 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
731864eb4a Removed useless translation keys 2020-04-25 12:43:41 +02:00
Marc Guenneugues
fb2759eaf6 Correct lint errors 2020-04-25 10:32:35 +02:00
Marc Guenneugues
966fedc501 ADD: New hook updateTotalPrice in commonObject update_price 2020-04-25 10:19:09 +02:00
Laurent Destailleur
99f445962b Fix regression 2020-04-25 03:38:12 +02:00
Laurent Destailleur
4dc8e59e7f Fix order of thumbs 2020-04-25 03:34:31 +02:00
Laurent Destailleur
5ce3174181 Look and feel v12 2020-04-25 03:31:47 +02:00
Laurent Destailleur
38f2aad0c6 Debug asset module 2020-04-25 03:19:30 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
c9f242406c Look and feel v12 2020-04-25 02:44:24 +02:00
Laurent Destailleur
291664d109 Look and feel v12 2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
d416edab1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/accounting-files.php
2020-04-24 22:49:59 +02:00
Maxime Lecoq
9ed7ff80a1 FIX CUnit->fetch id/rowid 2020-04-24 21:08:47 +02:00
Laurent Destailleur
fc1a1c6afe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 19:56:29 +02:00
Laurent Destailleur
d11dcc35c3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2020-04-24 19:56:19 +02:00
Laurent Destailleur
6798e9e6f5 Fix remove warning missing the seller in update_price 2020-04-24 19:52:54 +02:00
Laurent Destailleur
df10b86d1f FIX consistency of price w/wo vat wrong when price entered with tax 2020-04-24 19:52:34 +02:00
Laurent Destailleur
48245cf134
Merge pull request #13735 from atm-gauthier/11.0_fix_elementtype
FIX : Access to undeclared static property: Contact::$table_element
2020-04-24 19:02:11 +02:00
Laurent Destailleur
e84601f5ed
Merge pull request #13710 from TobiasSekan/FixMissingErrorOnCloneObject
FIX not shown error on clone vendor invoice with ExtraFields
2020-04-24 19:01:42 +02:00
Laurent Destailleur
4564a5cffd
Update accounting-files.php 2020-04-24 19:01:08 +02:00
Laurent Destailleur
708f89c9dc
Merge pull request #13732 from pstructures/new-devlelop
Fixed Translation Issue Default Contact Address For Field
2020-04-24 19:00:04 +02:00