Laurent Destailleur
|
9f67bb0aa3
|
Start 6.0.7
|
2018-03-22 21:58:24 +01:00 |
|
Laurent Destailleur
|
ed2d9f179b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/card.php
|
2018-03-22 14:12:37 +01:00 |
|
florian HENRY
|
1feb22ea9c
|
fix user right on modRessource
|
2018-03-21 22:24:11 +01:00 |
|
atm-ph
|
2094c48b7f
|
Fix missing folder with multientity
|
2018-03-21 12:14:04 +01:00 |
|
atm-ph
|
cad7bdc74b
|
Fix documents are lost if we rename contrat ref
|
2018-03-21 11:54:25 +01:00 |
|
Laurent Destailleur
|
04199c2b4b
|
Fix according to mail of Olivier Geffroy the 21th of march
|
2018-03-21 10:59:13 +01:00 |
|
arnaud
|
32ce42610a
|
FIX show status on societe banner
|
2018-03-16 11:18:00 +01:00 |
|
ATM-Nicolas
|
e801b5a431
|
FIX : Delete tasks on project delete will now trigger TASK_DELETE
|
2018-03-14 11:38:42 +01:00 |
|
atm-quentin
|
af09a3714b
|
FIX reverse field to have object loaded in doaction
|
2018-03-13 17:12:03 +01:00 |
|
Laurent Destailleur
|
dcd3387a30
|
Update commande.class.php
|
2018-03-13 09:53:21 +01:00 |
|
Laurent Destailleur
|
51229a602f
|
Update commande.class.php
|
2018-03-13 09:51:45 +01:00 |
|
atm-quentin
|
6c7a5cebdf
|
FIX check verif exped on delete order
|
2018-03-13 09:34:50 +01:00 |
|
Laurent Destailleur
|
d045dca003
|
Fix financial commitment
|
2018-03-12 20:04:25 +01:00 |
|
TuxGasy
|
34145ed443
|
Do not display multicurrency cols if currency of object is same as main currency
|
2018-03-11 21:58:32 +01:00 |
|
Laurent Destailleur
|
95e7062ca3
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-03-11 19:29:01 +01:00 |
|
Laurent Destailleur
|
d5d6939fd9
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/core/class/commonobject.class.php
|
2018-03-11 19:28:39 +01:00 |
|
Laurent Destailleur
|
f98ca2e31a
|
Merge pull request #8335 from inoveaconseil/patch-1
Fix #8092
|
2018-03-11 00:06:28 +01:00 |
|
Laurent Destailleur
|
03f7df88c6
|
Update card.php
|
2018-03-11 00:05:32 +01:00 |
|
Inovea Conseil
|
c2397fad60
|
Fix #8092
|
2018-03-10 23:49:43 +01:00 |
|
Maxime Kohlhaas
|
c008853842
|
Fix #8057
|
2018-03-10 23:05:33 +01:00 |
|
Maxime Kohlhaas
|
fd36ade61a
|
Fix unit in replenish #7225
|
2018-03-10 11:20:32 +01:00 |
|
TuxGasy
|
9eeb80151e
|
Fix bug when updating multi currency rate on invoice supplier
|
2018-03-09 21:13:54 +01:00 |
|
atm-ph
|
53ce297ab3
|
Fix travis - missing documentation of new param
|
2018-03-09 09:30:11 +01:00 |
|
Marc de Lima Lucio
|
884b74a6bb
|
FIX: warning when adding ECM files using old photo path
|
2018-03-07 17:12:59 +01:00 |
|
Laurent Destailleur
|
8b9041b93e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-03-07 13:02:18 +01:00 |
|
Laurent Destailleur
|
4caefbe926
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2018-03-07 12:59:52 +01:00 |
|
Marc de Lima Lucio
|
dd208348c4
|
FIX: add planned delivery to order exports
|
2018-03-07 12:18:08 +01:00 |
|
alexis Algoud
|
cb27eb98e1
|
FIX natural search double quote
|
2018-03-07 11:42:47 +01:00 |
|
atm-ph
|
5971cd8e59
|
Fix label goes in desc and lost fourn ref
|
2018-03-05 17:18:03 +01:00 |
|
atm-ph
|
ebb4da8417
|
Fix keep supplier proposal price in supplier order
|
2018-03-05 16:58:35 +01:00 |
|
ATM-Nicolas
|
60f8ca1283
|
Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_order_line_fk_multicurrency
|
2018-03-05 09:03:20 +01:00 |
|
Laurent Destailleur
|
6bb91dd5d2
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-03-02 17:54:42 +01:00 |
|
Laurent Destailleur
|
ee4fcba4f2
|
Fix class not found
|
2018-02-27 22:11:11 +01:00 |
|
gauthier
|
4d05bff780
|
FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back
|
2018-02-27 12:27:25 +01:00 |
|
ATM-Nicolas
|
27100df927
|
FIX : Avoid empty value to fk_multicurrency attribute
|
2018-02-27 11:06:11 +01:00 |
|
Laurent Destailleur
|
64dd6439e7
|
Merge pull request #8223 from atm-florian/6.0
fix bad link invoice URL into acoutantcy customer affectation
|
2018-02-25 12:42:03 +01:00 |
|
Laurent Destailleur
|
286d62edb8
|
Merge pull request #8221 from ATM-Marc/FIX_usercard_columns
FIX: solve column mismatch in user card with multicompany transverse mode + code cleanup
|
2018-02-25 12:35:05 +01:00 |
|
Laurent Destailleur
|
c698558d9e
|
Merge pull request #8212 from simnandez/6.0
Fix: Not showing link to ad event if module is disabled
|
2018-02-25 12:28:06 +01:00 |
|
Laurent Destailleur
|
b20ae45265
|
Merge pull request #8210 from atm-john/fix_sql_entity
Fix sql entity for sub query
|
2018-02-25 12:27:35 +01:00 |
|
Laurent Destailleur
|
2d252e85e6
|
FIX Import process must stop after ending line nb to import
|
2018-02-25 12:15:36 +01:00 |
|
atm-ph
|
d300b943e1
|
Fix wrong price on supplier order line
|
2018-02-23 15:10:25 +01:00 |
|
florian HENRY
|
b4b185abe0
|
fix bad link invoice URL into acoutantcy customer affectation
|
2018-02-23 14:42:52 +01:00 |
|
Marc de Lima Lucio
|
36cc1c6ca9
|
FIX: solve column mismatch in user card's usergroup list + code cleanup
|
2018-02-23 11:59:22 +01:00 |
|
Juanjo Menent
|
1d6baf5f2b
|
Fix: Not showing link to ad event if module is disabled
|
2018-02-22 10:16:53 +01:00 |
|
John
|
b276a8186e
|
Fix sql entity for sub query
|
2018-02-21 10:03:04 +01:00 |
|
Laurent Destailleur
|
7f419a29e7
|
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill
fix the bill replacement with discounts #8028
|
2018-02-20 15:19:19 +01:00 |
|
Laurent Destailleur
|
01c2971f4f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-20 15:08:17 +01:00 |
|
Laurent Destailleur
|
9690e68bfb
|
Merge pull request #8206 from fmarcet/5.0
Fix: Barcode type on massive init
|
2018-02-20 15:07:53 +01:00 |
|
Laurent Destailleur
|
b8736f5103
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-20 14:59:40 +01:00 |
|
Laurent Destailleur
|
6c8e7494f0
|
Merge pull request #8200 from atm-maxime/fix_contact_tooltiip
Fix contact tooltip
|
2018-02-20 14:56:06 +01:00 |
|
Laurent Destailleur
|
67ee443b34
|
Fix can set holiday remaining to 0
|
2018-02-20 14:53:19 +01:00 |
|
Laurent Destailleur
|
4056b87a74
|
Fix syntax error
|
2018-02-20 12:36:03 +01:00 |
|
Laurent Destailleur
|
7321829732
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-20 12:34:15 +01:00 |
|
Laurent Destailleur
|
ea071b7680
|
Fix can't delete holiday refused
|
2018-02-20 12:31:26 +01:00 |
|
Ferran Marcet
|
671b4a399d
|
Fix: Barcode type
|
2018-02-19 17:47:24 +01:00 |
|
Ferran Marcet
|
2e1727e323
|
Fix: Barcode type
|
2018-02-19 17:45:19 +01:00 |
|
Ferran Marcet
|
5535daf84a
|
Merge branch '5.0up' into 5.0
|
2018-02-19 17:43:14 +01:00 |
|
sschwebel
|
7c583227fb
|
FIX: #8139
|
2018-02-19 10:58:05 +01:00 |
|
John
|
49bad95d31
|
fix method exist test
|
2018-02-15 17:04:27 +01:00 |
|
John
|
63987fa32e
|
fix invoice extrafield transmition to credit
|
2018-02-15 16:39:47 +01:00 |
|
Maxime Kohlhaas
|
bfd46f62ea
|
Fix : contact and user getnomurl needs all info to display tooltip correctly
|
2018-02-15 15:18:25 +01:00 |
|
Maxime Kohlhaas
|
6fe69d4a60
|
Wrong field in thirdparty getnomurl
|
2018-02-15 15:17:59 +01:00 |
|
Laurent Destailleur
|
15ab37b46e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-14 21:51:55 +01:00 |
|
Laurent Destailleur
|
b21feca9d7
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-14 21:51:35 +01:00 |
|
Laurent Destailleur
|
147b35d62e
|
Merge pull request #8194 from hregis/6.0_multicompany
Fix: Update entity field in llx_user_rights and llx_usergroup_rights
|
2018-02-14 21:31:02 +01:00 |
|
Laurent Destailleur
|
cf5c972c65
|
Merge pull request #8193 from atm-ph/fix_6.0_multicurrency_situation_invoice
Fix apply global progress don't update multicurrency values
|
2018-02-14 21:27:52 +01:00 |
|
Laurent Destailleur
|
483bfb096b
|
Merge pull request #8188 from atm-quentin/6.0_develop
NEW Add sale representative einstein_pdf_modules
|
2018-02-14 21:27:24 +01:00 |
|
Laurent Destailleur
|
c28d87252b
|
Merge pull request #8184 from laudeco/hotfix/8183_welcome_email_adherent
Fix 8183 - adherent welcome e-mail edition always put 1 instead of keeping the e-mail
|
2018-02-14 20:51:57 +01:00 |
|
Laurent Destailleur
|
d0fdf700d7
|
Update type.php
|
2018-02-14 20:51:33 +01:00 |
|
Laurent Destailleur
|
0d00c51c2a
|
Update type.php
|
2018-02-14 20:51:05 +01:00 |
|
Laurent Destailleur
|
23ee6748f7
|
Update fournisseurs.php
|
2018-02-14 20:36:13 +01:00 |
|
Regis Houssin
|
fa2fddcdc1
|
Fix: Update entity field in llx_user_rights and llx_usergroup_rights
|
2018-02-14 14:30:39 +01:00 |
|
atm-ph
|
c690dfb258
|
Fix apply global progress don't update multicurrency values
|
2018-02-14 10:15:38 +01:00 |
|
atm-quentin
|
144c13998a
|
NEW_einstein_pdf_modules
|
2018-02-13 09:51:33 +01:00 |
|
De Coninck Laurent
|
1052213c97
|
Fix 8183 - adherent welcome e-mail
Fix the adherent welcome e-mail.
[see: #8183]
|
2018-02-12 18:12:43 +01:00 |
|
Maxime Kohlhaas
|
ef05171641
|
Fix : contract service list context was mixing up with service list from product/service module
|
2018-02-12 13:48:43 +01:00 |
|
Regis Houssin
|
24cc687724
|
Fix: you can't check "fournisseur" with checkUserAccessToObject without
object ID
|
2018-02-12 09:28:41 +01:00 |
|
Regis Houssin
|
448fcae02f
|
Fix: move "fournisseur" in $checksoc
|
2018-02-12 09:03:53 +01:00 |
|
Regis Houssin
|
abb7e651d1
|
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug
|
2018-02-12 09:02:12 +01:00 |
|
Laurent Destailleur
|
4d6f87e544
|
Merge pull request #8168 from simnandez/6.0
Fix: Contracts not show price
|
2018-02-12 03:13:31 +01:00 |
|
Laurent Destailleur
|
d731857fd0
|
Update linkedobjectblock.tpl.php
|
2018-02-12 03:13:12 +01:00 |
|
Laurent Destailleur
|
12f1e4c04b
|
Merge pull request #8167 from atm-john/fix_contract_line_extrafields_on_save
Fix Missing insert of extrafields on contract add line
|
2018-02-12 02:56:19 +01:00 |
|
Laurent Destailleur
|
d3d3bcaca5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-12 02:53:21 +01:00 |
|
Laurent Destailleur
|
f88874c1f7
|
Code comment
|
2018-02-12 02:53:08 +01:00 |
|
Juanjo Menent
|
67ce71bc48
|
Fix: Contracts not show price
|
2018-02-09 18:23:11 +01:00 |
|
John
|
2817ace0d2
|
Fix contract line extrafields save on add line
|
2018-02-09 15:47:18 +01:00 |
|
Regis Houssin
|
a5814ce779
|
Fix: nocheck for "fournisseur", already check with "societe"
|
2018-02-09 11:00:43 +01:00 |
|
atm-ph
|
b074f580db
|
Fix can't update $nblignes on beforePDFCreation if we update $object->lines
|
2018-02-08 16:59:17 +01:00 |
|
Laurent Destailleur
|
39cd63e2d4
|
Merge pull request #8143 from simnandez/6.0
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
|
2018-02-08 14:07:14 +01:00 |
|
Laurent Destailleur
|
371b168db1
|
Merge pull request #8133 from atm-quentin/6.0
FIX unset categorie
|
2018-02-08 13:09:52 +01:00 |
|
Laurent Destailleur
|
3f17c92aa3
|
Update card.php
|
2018-02-08 13:09:21 +01:00 |
|
Laurent Destailleur
|
c988d3f1cc
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
|
2018-02-08 12:53:26 +01:00 |
|
Laurent Destailleur
|
2e3bb4a585
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-08 12:48:48 +01:00 |
|
Laurent Destailleur
|
8156374005
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-08 12:45:30 +01:00 |
|
Laurent Destailleur
|
a26bb2d884
|
FIX #8151
|
2018-02-08 12:41:31 +01:00 |
|
atm-ph
|
6254e20c67
|
Fix position if module use pdf hook "linkedobjects"
|
2018-02-07 15:41:39 +01:00 |
|
Juanjo Menent
|
9b56555962
|
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
|
2018-02-06 18:49:29 +01:00 |
|
atm-quentin
|
2081aefc84
|
FIX creer into lire
|
2018-02-05 16:07:08 +01:00 |
|
Regis Houssin
|
839de65012
|
Fix: avoid error -1
|
2018-02-05 11:30:31 +01:00 |
|
atm-quentin
|
ae9c7ad6b6
|
FIX unset categorie
|
2018-02-05 10:40:52 +01:00 |
|
Laurent Destailleur
|
906a9eaa5a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-04 23:12:57 +01:00 |
|
Laurent Destailleur
|
dbe45d03d3
|
Fix: amount into form must be numeric without format
|
2018-02-04 23:12:19 +01:00 |
|
Laurent Destailleur
|
e5cb2be618
|
Merge pull request #8129 from hregis/6.0_bug
Fix: remove lines with special code when convert to reduc
|
2018-02-04 12:18:20 +01:00 |
|
Laurent Destailleur
|
f3700b66c6
|
Fix size of columns when using PRODUCT_USE_UNIT
|
2018-02-04 11:17:45 +01:00 |
|
Laurent Destailleur
|
fd8f89c708
|
FIX a discount is a percent, not an amount, so we use vatrate not price
|
2018-02-04 11:13:47 +01:00 |
|
Regis Houssin
|
8ee1186492
|
Fix: wrong test
|
2018-02-04 09:05:35 +01:00 |
|
Regis Houssin
|
d5b7184c8d
|
Fix: wrong test
|
2018-02-04 09:04:15 +01:00 |
|
Regis Houssin
|
a161ca37ff
|
Fix: use product_type instead special_code
|
2018-02-04 08:58:31 +01:00 |
|
Regis Houssin
|
c1e6d88442
|
Fix: use product_type instead special_code
|
2018-02-04 08:55:51 +01:00 |
|
Laurent Destailleur
|
2114e6ba4e
|
Merge pull request #8101 from simnandez/6.0
FIX: #7974 Contract - Invalid reference on the document
|
2018-02-03 16:57:22 +01:00 |
|
Juanjo Menent
|
c434136ba5
|
Merge remote-tracking branch 'upstream/6.0' into 6.0
|
2018-02-02 23:44:54 +01:00 |
|
Juanjo Menent
|
464ee6f9d6
|
Revert
|
2018-02-02 17:46:25 +01:00 |
|
Regis Houssin
|
13106d34a6
|
Fix: compatibility with multicompany sharing
|
2018-02-02 12:36:47 +01:00 |
|
Regis Houssin
|
38d735341c
|
Fix: remove lines with special code when convert to reduc
|
2018-02-02 10:24:16 +01:00 |
|
Regis Houssin
|
2147bd23e6
|
Fix: remove lines with special code when convert to reduc
|
2018-02-02 10:22:47 +01:00 |
|
atm-quentin
|
c80fa48225
|
FIX update_extras on fourn card
|
2018-02-01 09:31:04 +01:00 |
|
Laurent Destailleur
|
bdfbe462df
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-01-29 21:04:49 +01:00 |
|
Laurent Destailleur
|
8102883356
|
Fix error when email list contains ', ,'
Fix output dir of notification
|
2018-01-29 20:36:40 +01:00 |
|
Juanjo Menent
|
3c281ccefa
|
FIX: Bad localtaxes assignment in cashdesk
|
2018-01-29 17:50:00 +01:00 |
|
kadogo
|
ba58578d60
|
FIX: Global on $user parameter reset the variable
When we use the fichinter API with global, the $user object is reset
If global is not applied on $user we can retrieve the informations from it
|
2018-01-27 19:31:48 +01:00 |
|
Juanjo Menent
|
cdb63bada3
|
FIX: #7974 Contract - Invalid reference on the document
|
2018-01-26 18:13:55 +01:00 |
|
Laurent Destailleur
|
1834be79a0
|
Fix supplier suggested when creating order from project overview
|
2018-01-26 11:31:34 +01:00 |
|
Laurent Destailleur
|
5b917c039e
|
Prepare 6.0.6
|
2018-01-26 11:08:08 +01:00 |
|
Laurent Destailleur
|
2c0eeaf8de
|
FIX #8093
|
2018-01-25 20:57:51 +01:00 |
|
Laurent Destailleur
|
1da7b154c1
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-01-24 11:48:31 +01:00 |
|
Laurent Destailleur
|
54fb59d8db
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/paiement.php
|
2018-01-24 11:45:43 +01:00 |
|
Laurent Destailleur
|
e66b266432
|
Merge pull request #8090 from atm-arnaud/FIX_sepa_mail_encode
FIX email sent was not in HTML
|
2018-01-24 11:17:16 +01:00 |
|
De Coninck Laurent
|
53ac13c792
|
check on type replacement #8028
|
2018-01-23 18:03:29 +01:00 |
|
arnaud
|
c0481be8d8
|
FIX subject mail sepa
|
2018-01-23 17:01:03 +01:00 |
|
arnaud
|
19c616756a
|
FIX email sent was not in HTML
|
2018-01-23 12:14:22 +01:00 |
|
John
|
f2ae3ee41d
|
Fix get entity if multiple
|
2018-01-23 09:49:21 +01:00 |
|
atm-ph
|
054d98a2ba
|
Fix each total isn't aligned on payment card
|
2018-01-22 17:09:17 +01:00 |
|
De Coninck Laurent
|
4874d08062
|
fix the bill replacement with discounts #8028
|
2018-01-19 09:01:37 +01:00 |
|
Maxime Kohlhaas
|
4c0dc21ca0
|
Fix validate contrat was not using force_number parameter
|
2018-01-18 14:07:32 +01:00 |
|
Laurent Destailleur
|
bc7bd77cea
|
Fix permission to open supplier order
|
2018-01-17 15:54:27 +01:00 |
|
Laurent Destailleur
|
5d4eda68e0
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-01-16 19:53:02 +01:00 |
|
Laurent Destailleur
|
94b1d59f2b
|
Fix missing check on object entity
|
2018-01-16 19:52:14 +01:00 |
|
Laurent Destailleur
|
f307fecaf6
|
Merge pull request #8064 from atm-quentin/6.0
FIX missing hook invoice index
|
2018-01-16 12:15:06 +01:00 |
|
atm-quentin
|
6feacab4f5
|
FIX missing hook invoice index
|
2018-01-15 14:24:19 +01:00 |
|
Laurent Destailleur
|
4c8af0ff50
|
Fix name alias on list
|
2018-01-15 12:24:56 +01:00 |
|
Laurent Destailleur
|
b154357683
|
Merge pull request #7982 from simnandez/6.0
FIX: Bad name alias showing in name of third column
|
2018-01-15 12:22:40 +01:00 |
|
Laurent Destailleur
|
3b9aee7d4c
|
Update list.php
|
2018-01-15 12:22:21 +01:00 |
|
Laurent Destailleur
|
9f6118ed52
|
Code comments
|
2018-01-14 03:12:22 +01:00 |
|
Laurent Destailleur
|
c947502efa
|
Fix typo
|
2018-01-13 17:22:59 +01:00 |
|
Laurent Destailleur
|
764646634d
|
Merge pull request #8051 from atm-florian/6.0
fix: search translation into external module files also
|
2018-01-11 01:12:53 +01:00 |
|
Laurent Destailleur
|
0ae02d76a3
|
Merge pull request #8049 from fmarcet/6.0
Fix: Still using property ->client instead of ->thirdparty.
|
2018-01-11 01:03:47 +01:00 |
|
Laurent Destailleur
|
205e715b7f
|
Merge pull request #8046 from hregis/6.0_bug
Fix: avoid Warning: A non-numeric value encountered
|
2018-01-11 00:53:07 +01:00 |
|
Laurent Destailleur
|
79562f8d5b
|
Merge pull request #8036 from atm-ph/fix_6.0_model_pdf_invoice_payment
Fix wrong address used into PDF model of supplier payment
|
2018-01-11 00:37:37 +01:00 |
|
Laurent Destailleur
|
b5fe953a64
|
Merge pull request #8035 from pdermody/6.0
Fix #8034 - Surface and volume units are calculated incorrectly
|
2018-01-11 00:36:00 +01:00 |
|
florian HENRY
|
c8c550cd33
|
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0
|
2018-01-10 20:49:48 +01:00 |
|