lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,304 Commits 43 Branches 150 Tags 886 MiB
3.8
Commit Graph

43255 Commits

Author SHA1 Message Date
Laurent Destailleur
e9ee816826 Merge pull request #4561 from fappels/3.8 
Fix #4556 Desired minimum stock and Stock limit for alert cleared on modify product
 2016-02-05 11:12:31 +01:00
Laurent Destailleur
c9c5484805 Merge pull request #4570 from frederic34/patch-8 
Update CMailFile.class.php
 2016-02-05 10:58:42 +01:00
Laurent Destailleur
69e0f1ebc3 Add log to help debug 2016-02-04 17:55:30 +01:00
Frédéric FRANCE
a656607122 Update CMailFile.class.php 2016-02-04 17:12:58 +01:00
Francis Appels
5f7cb75518 Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card 
removed inputs from update form also removed from update action
 2016-02-03 19:52:09 +01:00
fmarcet
6260c1ae9e FIX: Check stock of batch on shippment 2016-02-03 11:33:13 +01:00
Laurent Destailleur
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
fmarcet
d6cda60ed1 FIX: Check stock of product by warehouse if $entrepot_id defined on shippings 2016-02-01 13:40:02 +01:00
fmarcet
acc9879c7c FIX: It doesn't check if there is enough stock to update the lines of orders/invoices 2016-02-01 13:05:14 +01:00
Laurent Destailleur
2d0c823ffe Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:45:06 +01:00
Laurent Destailleur
dfd4d36bdf Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-30 15:58:11 +01:00
Laurent Destailleur
c9661ee20e Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-30 15:57:09 +01:00
Laurent Destailleur
3591f51918 Merge pull request #4480 from hregis/3.8_bug 
Fix: for avoid conflict with "global $m" in memory.lib.php
 2016-01-30 12:22:47 +01:00
Laurent Destailleur
b27e31b3ae Merge pull request #4483 from marcosgdf/bug-4440-3 
Corrected typo of PR #4444
 2016-01-30 12:20:50 +01:00
Laurent Destailleur
e574ebe34c Merge pull request #4514 from hregis/3.8_bug2 
Fix: missing field "label"
 2016-01-30 11:57:28 +01:00
Laurent Destailleur
f5a4b9db31 Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid 
FIX filter by socid if from customer card
 2016-01-30 11:56:40 +01:00
Laurent Destailleur
cd58c93de6 FIX If option to hide automatic ECM is on, dont show menu. 2016-01-28 12:51:34 +01:00
phf
6eecf2f29a FIX filter by socid if from customer card 2016-01-28 12:30:49 +01:00
Regis Houssin
8a80e06580 Fix: missing field "label" 2016-01-28 11:42:00 +01:00
Laurent Destailleur
20e110a882 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-27 18:48:06 +01:00
Laurent Destailleur
45656c18e8 Fix hover css 2016-01-27 18:47:52 +01:00
Christophe Battarel
1baf25de3c FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden 
constant
 2016-01-27 12:04:00 +01:00
Laurent Destailleur
fccecc902d Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 2016-01-26 18:30:08 +01:00
Laurent Destailleur
5fd6057c6c FIX Deadlock situation. Can't edit anymore contract. 
FIX List of automatic events was not visible.
 2016-01-26 18:22:37 +01:00
Laurent Destailleur
25924f31ad Bad translation 2016-01-26 17:57:57 +01:00
Laurent Destailleur
33355c613a FIX When we make a direct assignement on a task to a user, we must check 
he is also assigned to project (and if not assign it)
 2016-01-26 17:50:57 +01:00
fmarcet
c2efee8a29 FIX: Contrat card don't consider user permissions to show active/unactive service button 2016-01-26 13:02:21 +01:00
Laurent Destailleur
feb114625d Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-25 15:37:55 +01:00
Laurent Destailleur
c1b6630c16 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/main.inc.php
 2016-01-25 15:37:04 +01:00
Raphaël Doursenaud
ed16699de6 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-25 15:32:08 +01:00
Laurent Destailleur
0814fa76f8 FIX CVE CVE-2015-8685 2016-01-25 15:26:52 +01:00
Laurent Destailleur
667651860d Fix sql injection #4341 2016-01-25 15:24:31 +01:00
Marcos García de La Fuente
83263e242e Corrected typo of PR #4444 2016-01-23 20:32:22 +01:00
Laurent Destailleur
a841db1eeb FIX Purge of temp files was broken 2016-01-23 12:24:46 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5 Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-23 11:32:06 +01:00
Laurent Destailleur
627f606c4d Fix list of leave request was not showing label correctly. 2016-01-23 11:17:20 +01:00
Laurent Destailleur
2b96c8f205 FIX Noway to validate a leave request for some uer even if they have 
permission for.
 2016-01-23 11:05:06 +01:00
Laurent Destailleur
fac38db2bf Merge pull request #4457 from atm-arnaud/3.8_fix_bookmarks_user_update 
FIX bookmark's user change after update if the user isn't superadmin
 2016-01-22 16:42:59 +01:00
Laurent Destailleur
dadc24462a Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:14:39 +01:00
Laurent Destailleur
49a325e7ae Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:10:27 +01:00
Laurent Destailleur
fedf1f3288 Fix view of product image when using old path 
Fix size of image uploaded on user.
 2016-01-22 14:02:48 +01:00
Regis Houssin
2b7b7e014d Fix: for avoid conflict with "global $m" in memory.lib.php 2016-01-22 13:20:21 +01:00
Laurent Destailleur
50b0019ead A protection to avoid situation loosing all admin accounts 2016-01-22 11:54:14 +01:00
Laurent Destailleur
cbd01bae49 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/societe/index.php
 2016-01-22 03:18:51 +01:00
Laurent Destailleur
56a4466b5b Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-22 03:04:22 +01:00
Laurent Destailleur
34c648b351 FIX #4418 2016-01-22 03:04:07 +01:00
Laurent Destailleur
219ce73ea2 Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook 
FIX nblignes not calculated after hook and hook can't modify this val...
 2016-01-22 02:10:36 +01:00
arnaud
9ce6e2938c FIX bookmark's user change after update if the user hasn't superadmin right 2016-01-19 09:46:27 +01:00
Laurent Destailleur
2386b79dfc FIX Option to disable meteo was not set correctly in edit mode 2016-01-18 14:49:15 +01:00
Regis Houssin
535d3bc087 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2016-01-18 13:04:08 +01:00
Marcos García de La Fuente
da637db162 FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays 2016-01-18 10:17:59 +01:00
Laurent Destailleur
4d2b5d71af Fix missing translation key 2016-01-17 17:35:02 +01:00
Laurent Destailleur
be4f9baac6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-16 10:21:52 +01:00
Laurent Destailleur
d46c655fb4 FIX: Sql syntax error in doc_generic_task_odt 2016-01-16 10:20:14 +01:00
Regis Houssin
6e30d5e516 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2016-01-15 13:16:40 +01:00
Regis Houssin
6aeb18ed75 Revert "Fix: for avoid division by 0" 
This reverts commit c71d578931.
 2016-01-15 13:14:55 +01:00
Regis Houssin
905f9d78ed Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9) 2016-01-15 13:12:19 +01:00
arnaud
8b2541ebf9 FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules 2016-01-14 14:10:50 +01:00
Laurent Destailleur
d98415f9b5 Merge pull request #4413 from hregis/3.8_bug 
Fix: ajax error with multicompany module
 2016-01-14 11:08:16 +01:00
Regis Houssin
3a3ae90a0a Fix: ajax error with multicompany module 2016-01-13 15:44:26 +01:00
phf
9b682e095f FIX can't clone event 2016-01-13 14:41:32 +01:00
Laurent Destailleur
93ed7c098b Merge pull request #4407 from atm-ph/fix_3.8_pdf_muscadet_use_hour 
FIX pdf_muscadet delivery hour
 2016-01-12 23:21:05 +01:00
Laurent Destailleur
1b1bd73e6b Merge pull request #4404 from frederic34/patch-8 
FIX When doing payment for money back, bank account was not set by default
 2016-01-12 23:20:32 +01:00
Laurent Destailleur
85747c7383 Merge pull request #4400 from aspangaro/3.8-p1 
Fix: #4394 Untranslated label in list of expense reports
 2016-01-12 23:14:16 +01:00
Laurent Destailleur
5b26f456f4 Merge pull request #4356 from GPCsolutions/3.8-4291 
FIX #4291 Correctly filter bank card GETPOSTs
 2016-01-12 22:51:17 +01:00
fmarcet
79992b4947 FIX: The third dashboard don't consider user permissions 2016-01-12 11:34:50 +01:00
phf
f280061a90 FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf 2016-01-12 11:09:47 +01:00
Frédéric FRANCE
92885065c6 Update facture.php 2016-01-12 10:09:02 +01:00
aspangaro
7552fa20eb Fix: #4394 Untranslated label in list of expense reports 2016-01-11 21:18:12 +01:00
Raphaël Doursenaud
7281338f8d FIX #4291 Correctly filter bank card GETPOSTs 2016-01-11 10:51:45 +01:00
Laurent Destailleur
861376e461 Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7 2016-01-10 18:49:11 +01:00
Laurent Destailleur
a9f0d6964a Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 2016-01-10 18:47:47 +01:00
Laurent Destailleur
801e2bca4b Fix #4239 2016-01-10 18:42:35 +01:00
Laurent Destailleur
cdaccf7c4b Fix: markRate can be 100 2016-01-10 18:28:50 +01:00
Laurent Destailleur
70b57322a2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-10 13:05:35 +01:00
Laurent Destailleur
6685502d5c Fix add Croatia into list of country in EEC 2016-01-10 13:05:22 +01:00
Laurent Destailleur
94814e58e5 Merge pull request #4334 from olsesacl/patch-1 
Fix check userlocaltax1_rate and userlocaltax2_rate
 2016-01-10 11:51:26 +01:00
Laurent Destailleur
40f0d0c9f2 Merge pull request #4321 from fmarcet/3.7 
FIX: Email templates not compatible with Multicompany
 2016-01-10 11:49:37 +01:00
Laurent Destailleur
8366310f0f Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/agenda_extsites.php
 2016-01-08 14:47:46 +01:00
Laurent Destailleur
e008922919 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/admin/agenda_extsites.php
 2016-01-08 14:45:53 +01:00
Laurent Destailleur
5414cb6f12 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2016-01-08 14:43:20 +01:00
Laurent Destailleur
a26a6c2449 Fix sql injection even when code is on several lines 2016-01-08 14:43:04 +01:00
Laurent Destailleur
c2b8be9aaf Merge pull request #4355 from GPCsolutions/3.6-4291 
FIX #4291 Correctly filter external calendar GETPOSTs
 2016-01-08 14:23:56 +01:00
Laurent Destailleur
36dc8b1ce7 FIX #4341 2016-01-08 13:57:53 +01:00
Raphaël Doursenaud
f2178f0369 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-08 06:42:28 +01:00
Sergio Sanchis Climent
dfdf58051e Edited correctly for check values 2016-01-07 09:37:04 +01:00
fmarcet
d8360a2a01 FIX: Email templates not compatible with Multicompany 2016-01-07 08:18:36 +01:00
Laurent Destailleur
9d3afe45d3 Merge pull request #4340 from hregis/3.8_bug 
Fix: disable main.inc.php hooks
 2016-01-07 00:08:48 +01:00
Laurent Destailleur
b4d9f1bece Merge pull request #4338 from frederic34/patch-10 
FIX: Missing leave request type when calling function
 2016-01-07 00:07:29 +01:00
Regis Houssin
3ae5da1cd6 Fix: disable main.inc.php hooks 2016-01-06 16:18:52 +01:00
Frédéric FRANCE
4dacf462db Update card.php 2016-01-05 17:36:48 +01:00
Frédéric FRANCE
a0b3cdbd21 Update list.php 2016-01-05 17:33:54 +01:00
Sergio Sanchis Climent
ffd7f4ea30 Fix userlocaltax 
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
 2016-01-05 09:47:14 +01:00
fmarcet
cafe148f72 FIX: Email templates not compatible with Multicompany 2016-01-04 09:12:27 +01:00
Laurent Destailleur
f6fead7403 Merge pull request #4317 from marcosgdf/bug-3798 
FIX #3798 #2519 Cron jobs would never be executed
 2016-01-03 19:36:58 +01:00
Marcos García de La Fuente
ae2295d019 Improvement suggested by @eldy 2016-01-03 15:10:22 +01:00
Laurent Destailleur
0cad938e09 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/install/upgrade.php
 2016-01-02 12:19:49 +01:00
Laurent Destailleur
b46aec8e7e Fix to allow phpunit of migration process for 3.5 to 3.6 2016-01-02 12:18:26 +01:00
Laurent Destailleur
35ce670bf2 Fix to allow phpunit of migration process for 3.4 to 3.5 2016-01-02 12:18:12 +01:00
phf
fffc8a430d FIX call trigger LINEBILL_SUPPLIER_CREATE 2015-12-31 15:48:16 +01:00
Laurent Destailleur
a234482d08 FIX #3694 2015-12-31 14:55:53 +01:00
Laurent Destailleur
c004342976 FIX #3694 2015-12-31 14:55:10 +01:00
Juanjo Menent
3aba3eda3c Merge pull request #4316 from marcosgdf/bug-4272 
FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty
 2015-12-30 21:49:52 +01:00
Juanjo Menent
08b4903057 Merge pull request #4315 from marcosgdf/bug-4155 
FIX #4155 Search Categories error
 2015-12-30 21:49:25 +01:00
fmarcet
cebb996120 FIX: Email templates not compatible with Multicompany 2015-12-29 11:22:18 +01:00
fmarcet
f8e156ea30 FIX: Email templates not compatible with Multicompany 2015-12-29 10:35:10 +01:00
Marcos García de La Fuente
039039bb00 FIX #3798 #2519 Cron jobs would never be executed 2015-12-28 15:17:53 +01:00
Marcos García de La Fuente
bec00e37e0 FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty 2015-12-28 15:04:24 +01:00
Marcos García de La Fuente
5773171efc FIX #4155 Search Categories error 2015-12-28 14:04:37 +01:00
Laurent Destailleur
6905842794 Update list of module in demo with new 3.8 modules 2015-12-27 20:31:39 +01:00
Laurent Destailleur
e536e10269 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:06:31 +01:00
Laurent Destailleur
06754068ff Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:02:19 +01:00
Laurent Destailleur
96bc2023f3 Prepare package 3.6.6 2015-12-27 18:56:15 +01:00
Laurent Destailleur
46d122c43a Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-27 18:20:58 +01:00
Laurent Destailleur
97030b05ce FIX #4281 2015-12-27 18:20:39 +01:00
Laurent Destailleur
5afed31265 Merge pull request #4305 from marcosgdf/bug-4036 
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
 2015-12-27 17:37:29 +01:00
Laurent Destailleur
80989fd2c9 Merge pull request #4304 from marcosgdf/bug-4302 
FIX #4302 Undefined variable $conf in Commande::LibStatut
 2015-12-27 17:37:02 +01:00
Laurent Destailleur
ff6dc32827 Merge pull request #4303 from marcosgdf/bug-4282 
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
 2015-12-27 17:36:48 +01:00
Laurent Destailleur
299e34f3ee Merge pull request #4294 from marcosgdf/bug-4287 
FIX #4287 SQL error when accessing an unexisting proposal
 2015-12-27 17:33:09 +01:00
Marcos García de La Fuente
ebdaf7dfa6 FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7 2015-12-27 15:12:02 +01:00
Marcos García de La Fuente
c40c695d20 FIX #4036 Direct printing module without any driver configured, shows an unformatted error message 2015-12-27 14:58:33 +01:00
Marcos García de La Fuente
98351d6fec FIX #4302 Undefined variable $conf in Commande::LibStatut 2015-12-27 13:15:05 +01:00
Marcos García de La Fuente
67bdfa2617 FIX #4282 Defined shipping time were not shown in Customer order's PDF documents 2015-12-27 13:10:33 +01:00
Regis Houssin
c65babf3b5 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-12-27 12:50:41 +01:00
Marcos García de La Fuente
686348a0d6 FIX #4287 SQL error when accessing an unexisting proposal 2015-12-25 11:47:48 +01:00
Marcos García
da959c5cf0 Little typo in commit 8b633ae 2015-12-25 11:32:13 +01:00
Juanjo Menent
c6093fff3e Merge pull request #4289 from marcosgdf/bug-4285 
FIX #4285 SQL query shown when accessing an unexisting invoice
 2015-12-24 22:00:00 +01:00
Juanjo Menent
d4466a652a Merge pull request #4288 from marcosgdf/bug-4182 
FIX #4182 SQL error when deleting an unexisting bank entry
 2015-12-24 21:59:16 +01:00
Marcos García de La Fuente
de1625b9de FIX #4285 SQL query shown when accessing an unexisting invoice 2015-12-24 14:46:01 +01:00
Marcos García de La Fuente
8b633aee66 FIX #4182 SQL error when deleting an unexisting bank entry 2015-12-24 14:39:28 +01:00
Marcos García de La Fuente
d30c64413d FIX #4055 SQL error when trying to access a non-existing expedition 2015-12-24 14:27:12 +01:00
Laurent Destailleur
2d3915b88c Fix hook implementation on some thirdparty pages 2015-12-23 14:31:42 +01:00
Laurent Destailleur
932c3f9172 Fix init of situation_percent 2015-12-21 12:37:58 +01:00
Laurent Destailleur
7e03aaee23 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	composer.json
	htdocs/product/ajax/products.php
	htdocs/product/class/product.class.php
 2015-12-21 12:24:24 +01:00
Laurent Destailleur
9334cf8fd1 FIX #4243 sql injection 2015-12-19 18:03:08 +01:00
Laurent Destailleur
ba9796a438 Merge pull request #4082 from atm-maxime/fix_situation_percent 
Fix : situation percent should be 100 by default
 2015-12-19 17:49:04 +01:00
Laurent Destailleur
298396a57e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	test/phpunit/AllTests.php
 2015-12-19 01:27:19 +01:00
Laurent Destailleur
0df45f10c1 Fix travis 2015-12-19 01:09:42 +01:00
Laurent Destailleur
a136e90749 Fix travis 2015-12-19 01:06:11 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
 2015-12-18 21:20:12 +01:00
Laurent Destailleur
ebf68ecbe0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
 2015-12-18 21:03:57 +01:00
Laurent Destailleur
1b67a9faf1 Merge pull request #4262 from atm-ph/fix_3.8_create_order_from_propal 
FIX label of line is set in description field if empty
 2015-12-18 18:21:20 +01:00
Laurent Destailleur
eaacfabdf6 Merge pull request #4261 from hregis/3.8_bug 
Fix: Disable "main.inc.php" hooks with ajax return
 2015-12-18 17:32:45 +01:00
phf
c215898c52 FIX label of line is set in description field if empty 2015-12-18 17:11:14 +01:00
Laurent Destailleur
7af4d91828 Merge pull request #4251 from fmarcet/3.6 
FIX: Not deleting contracts on element_element table
 2015-12-18 17:07:42 +01:00
Laurent Destailleur
452feca64a Merge pull request #4249 from GPCsolutions/3.8-4242 
FIX #4242 Allow disabling dashes in documents
 2015-12-18 17:06:51 +01:00
Regis Houssin
70354def7c Fix: Disable "main.inc.php" hooks with ajax return 2015-12-18 13:27:51 +01:00
Laurent Destailleur
5f4947e3c1 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-17 17:16:37 +01:00
Laurent Destailleur
cdc408a84c Fix: button "now" was not working on date using no javascript 2015-12-17 17:16:26 +01:00
fmarcet
21f7271e51 FIX: Not deleting contrats on element_element table 2015-12-17 12:36:43 +01:00
Raphaël Doursenaud
7e98cfd5b6 FIX #4242 Allow disabling dashes in documents 
3.8 specific fix for new documents
 2015-12-17 10:33:17 +01:00
Raphaël Doursenaud
02e053acc6 FIX #4242 Allow disabling dashes in documents 
3.7 specific fix since document files have moved
 2015-12-17 10:26:27 +01:00
Raphaël Doursenaud
e6ec797af8 FIX #4242 Allow disabling dashes in documents 2015-12-17 10:21:44 +01:00
Laurent Destailleur
7c1fc2fee1 Merge pull request #4233 from aspangaro/3.7-accountancy1 
Fix: Accountancy Add an empty field for list of parent account - This value can be null
 2015-12-16 19:14:45 +01:00
Regis Houssin
c71d578931 Fix: for avoid division by 0 2015-12-16 16:39:50 +01:00
Regis Houssin
cb7f29b332 Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context 2015-12-16 13:32:44 +01:00
aspangaro
dfbc2814e7 Fix: Add an empty field for list of parent account - This value can be null 2015-12-15 21:10:53 +01:00
BENKE Charlie
23e727048e Add some new translations for export feature 2015-12-15 10:35:11 +01:00
Laurent Destailleur
3e3dbf850f Fix: bad case for function 2015-12-15 09:44:17 +01:00
Laurent Destailleur
b9aa80c4ca Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-14 10:33:32 +01:00
Laurent Destailleur
84ee18a11b Fix bad management of second level approvement 2015-12-14 10:33:18 +01:00
Laurent Destailleur
c5054c41cf Merge pull request #4211 from aspangaro/3.8-3879 
Fix #3879 Wrong translation in the new expense report module
 2015-12-13 19:56:55 +01:00
Laurent Destailleur
e37fc87cd5 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69 Fix bad merge 2015-12-13 17:33:20 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
aspangaro
c3acee56e2 Fix #3879 Wrong translation in the new expense report module 2015-12-12 10:06:11 +01:00
Florian HENRY
8edf3c65c6 work on accounting 2015-12-11 11:46:22 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit 
These files doesn't contain executable code and may pose a security
threat.
 2015-12-09 13:28:36 +01:00
Raphaël Doursenaud
3f9efc537b FIX #3953 Don't round supplier price 
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
 2015-12-07 14:35:04 +01:00
Laurent Destailleur
a209d18649 FIX Can use formated float number on old expense report module. 2015-12-06 19:51:28 +01:00
Florian HENRY
955fad910d FIX : Bug: $this is not accessible in static context in 
Mailing::libStatutDest #4050
 2015-12-04 17:32:17 +01:00
Laurent Destailleur
7d7a978ba0 Merge pull request #4145 from FHenry/3.8 
FIX :  Contract date inconsistency between /comm/card.php and #4089
 2015-12-04 10:25:50 +01:00
fmarcet
eb98bd1e78 FIX: Not delete a product when have customer price 2015-12-03 14:02:26 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:59:13 +01:00
Florian HENRY
3dec67ffdf Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-03 12:58:39 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:51:49 +01:00
Laurent Destailleur
64e35255ae Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-03 12:47:32 +01:00
Laurent Destailleur
a7d03af4af Fix sending emails from mergepedtool was just doing wrong things. 2015-12-03 12:47:21 +01:00
Laurent Destailleur
1694481df8 Merge pull request #4134 from FHenry/3.7 
FIX : Use "WHERE true" instead of "WHERE 1" #4132
 2015-12-03 11:58:23 +01:00
Laurent Destailleur
c86d4b51b1 Merge pull request #4133 from ricardomm85/3.8 
minor fix accessing $db
 2015-12-03 11:57:25 +01:00
Florian HENRY
10a925f7b4 FIX: WHERE 1=1 2015-12-03 11:52:41 +01:00
Laurent Destailleur
7bad058f47 Merge pull request #4114 from fappels/3.8_fix_round_buyprice 
FIX #3953 rounding of buying price
 2015-12-03 11:48:09 +01:00
Florian HENRY
ee08c4afc4 Display the ref_supplier inside the contract list of /comm/card.php 
#4090
 2015-12-03 11:03:40 +01:00
Florian HENRY
b4160c7f81 Cannot change the date of a contract #4088 2015-12-03 10:58:06 +01:00
Florian HENRY
281eaf2987 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-03 10:27:23 +01:00
Florian HENRY
bd632cf2b0 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-02 12:12:26 +01:00
ricardomm
eb504ffacc minor fix accessing $db 2015-12-02 11:53:23 +01:00
aspangaro
b1122b55d4 Fix : accountancy code on finance journal is not a constant 2015-11-30 21:07:27 +01:00
fappels
4a0ea97772 FIX #3953 rounding of buying price 
fix javascript for rounding of buying price
 2015-11-29 15:34:43 +01:00
Laurent Destailleur
e6806611a6 Merge pull request #4105 from atm-ph/fix_38_select_projects_list 
FIX jquery select of project generate js error on change event
 2015-11-28 16:30:21 +01:00
Laurent Destailleur
e72f4cb063 Merge pull request #4102 from fmarcet/3.6 
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
 2015-11-28 16:27:16 +01:00
Laurent Destailleur
2ce00b2956 Merge pull request #4099 from GPCsolutions/3.6-4097 
FIX #4097 Public holiday calculation
 2015-11-28 16:11:28 +01:00
phf
cbcb79b1eb FIX jquery select of project generate js error on change event 2015-11-27 16:58:28 +01:00
Frédéric FRANCE
e6033369a8 Update resource.class.php 2015-11-26 20:33:07 +01:00
Frédéric FRANCE
1b9039af36 Update list.php 2015-11-26 20:30:11 +01:00
fmarcet
208bf2545f Fix: Bug when idprof is mandatory on thrid creation and we use 
multicompany
 2015-11-26 17:14:03 +01:00
aspangaro
37da315af6 Remove old code 2015-11-26 06:30:09 +01:00
aspangaro
9a2259c681 Correct button 'Export' and 'Write bookkeeping' on finance journal 2015-11-26 06:19:24 +01:00
Laurent Destailleur
a6d8f943df Fix several bugs into leave requets module 2015-11-26 02:12:37 +01:00
Laurent Destailleur
1608fec937 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-26 00:47:29 +01:00
Laurent Destailleur
f353464bce Prepare code to fix #4095 2015-11-26 00:47:17 +01:00
Laurent Destailleur
a1a5eba2de Merge pull request #4096 from braito4/patch-1 
Part solution bug #4095
 2015-11-26 00:34:04 +01:00
Laurent Destailleur
bc6d04e495 Typo 2015-11-26 00:08:34 +01:00
Laurent Destailleur
ddd0f8224f Picto was not visible onto login page, we keep this behaviour. 2015-11-26 00:08:24 +01:00
Laurent Destailleur
ad087a75e6 Fix missing php 2015-11-25 23:32:00 +01:00
Laurent Destailleur
1caf148dc6 Merge pull request #4053 from marcosgdf/bug-3987 
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
 2015-11-25 22:24:56 +01:00
Laurent Destailleur
c8da4ee9f3 Merge pull request #4058 from marcosgdf/bug-3293 
FIX #3293 Login page form icons not shown
 2015-11-25 22:18:00 +01:00
aspangaro
8c0dffd24e Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy 2015-11-25 20:23:41 +01:00
Raphaël Doursenaud
973e42d10f FIX #4097 Public holiday calculation 
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
 2015-11-25 19:34:11 +01:00
braito4
677cba01ce Part solution bug #4095 
It allow us to deactivate the link to a project queries to lower the page workload.
 2015-11-25 18:58:47 +01:00
Marcos García
a30f7d543a Corrected fix 2015-11-25 10:19:11 +01:00
Raphaël Doursenaud
91ce70a6e9 FIX #4081 Added missing translation 2015-11-23 17:25:10 +01:00
Maxime Kohlhaas
da51a28766 Fix : situation percent should be 100 by default 2015-11-23 17:22:29 +01:00
Laurent Destailleur
7bde781206 Merge pull request #4061 from marcosgdf/bug-3231 
FIX #3231 [Members] Public subscription page displays GeoIP error
 2015-11-21 17:58:29 +01:00
Laurent Destailleur
dc6496fdf3 Merge pull request #4054 from marcosgdf/bug-3508 
FIX #3508 Useless tooltip in 3.8 boxes
 2015-11-21 17:49:09 +01:00
Laurent Destailleur
4481c4f978 Merge pull request #4052 from marcosgdf/bug-4049 
FIX #4049 PHP warning when trying to access a non-existing product/service
 2015-11-21 17:47:03 +01:00
Laurent Destailleur
295d83001a Merge pull request #4051 from marcosgdf/bug-4018 
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
 2015-11-21 17:46:26 +01:00
Laurent Destailleur
54b6ff02c0 Merge pull request #4048 from FHenry/3.8 
FIX Missing fields managed by update_customer_modtime in 3.8
 2015-11-21 17:46:02 +01:00
Marcos García de La Fuente
a456d21249 FIX #3231 [Members] Public subscription page displays GeoIP error 2015-11-21 13:25:09 +01:00
Laurent Destailleur
758b8e1f7e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/boxes/box_project.php
 2015-11-21 12:32:03 +01:00
Laurent Destailleur
c04743aa84 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-11-21 12:23:51 +01:00
Marcos García de La Fuente
3fbe10a578 FIX #3293 Login page form icons not shown 2015-11-21 12:18:29 +01:00
Marcos García de La Fuente
9f27e2323f FIX #3734 Do not show empty links of deleted source objects in stock movement list 2015-11-21 11:51:23 +01:00
Marcos García de La Fuente
4bf6cf4e65 FIX #3508 Useless tooltip in 3.8 boxes 2015-11-21 11:24:18 +01:00
Marcos García de La Fuente
e8fc5f0d3a FIX #3987 Undefined variable $newref in CommandeFournisseur::approve 2015-11-21 11:00:56 +01:00
Marcos García de La Fuente
eba5832d3a FIX #4049 PHP warning when trying to access a non-existing product/service 2015-11-21 10:58:58 +01:00
Marcos García de La Fuente
e31a8f25a2 FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined 2015-11-21 10:55:23 +01:00
Florian HENRY
c0d29d2a15 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-21 10:10:42 +01:00
Laurent Destailleur
30f0b6e2e8 Merge pull request #4046 from marcosgdf/bug-4016 
FIX #4016 User link is not correctly formed in emailing receivers
 2015-11-21 02:14:08 +01:00
Laurent Destailleur
94fdff9a46 Merge pull request #4045 from marcosgdf/bug-4043 
FIX #4043 Incorrect translation in error mesage in menu creation admin page
 2015-11-21 02:08:55 +01:00
Laurent Destailleur
45d6635bf6 Merge pull request #4025 from ndrosis/3.8 
FIX utf-8 characters in the mask mercure does not break counter
 2015-11-21 00:26:38 +01:00
Marcos García de La Fuente
2dedea8736 FIX #4016 User link is not correctly formed in emailing receivers 2015-11-20 22:03:44 +01:00
Marcos García de La Fuente
5dba9ef54e FIX #4043 Incorrect translation in error mesage in menu creation admin page 2015-11-20 22:00:11 +01:00
Drosis Nikos
ee4eb13fff Update functions2.lib.php 2015-11-20 19:05:00 +02:00
arnaud
07226d32ec FIX NB task and percent progress in box project 2015-11-20 16:11:48 +01:00
arnaud
4233d24f4b FIX export with category contact extrafields 2015-11-19 18:01:58 +01:00
Florian HENRY
80f19de223 fix && vs and 2015-11-19 16:32:25 +01:00
Florian HENRY
0c4f7a1b22 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-19 12:55:20 +01:00
Juanjo Menent
a627e32fca Merge pull request #4034 from fmarcet/3.7 
FIX Not use localtaxes when invoice some orders
 2015-11-18 23:07:24 +01:00
fmarcet
f615927d24 FIX Not use localtaxes when invoice some orders 2015-11-18 17:56:04 +01:00
arnaud
85a58f666a FIX product link in project box 2015-11-18 17:22:53 +01:00
fmarcet
0cbf8ca1dd FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO 
variable is empty or not
 2015-11-18 13:59:25 +01:00
Florian HENRY
28196a5fd9 add pgsql function 2015-11-18 12:24:52 +01:00
Nikos Drosis
5082b1cc66 Fix for utf-8 characters in the mask mercure 2015-11-17 20:22:27 +02:00
Laurent Destailleur
508b11733a Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name 
FIX 3.8 allow to search on alias name into select
 2015-11-16 23:48:18 +01:00
Laurent Destailleur
2f1a1c5111 Merge pull request #4008 from atm-ph/fix_38_trigger_propal_clone 
FIX can not have access to the new ids or propal lines on PROPAL_CLONE
 2015-11-16 23:46:03 +01:00
Laurent Destailleur
835700bb25 Merge pull request #4006 from marcosgdf/bug-3989 
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
 2015-11-16 23:42:38 +01:00
Laurent Destailleur
04ffe1c7f0 Merge pull request #4005 from marcosgdf/bug-3988 
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
 2015-11-16 23:42:04 +01:00
Laurent Destailleur
76eeb0d2f1 Merge pull request #4004 from marcosgdf/bug-3992 
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
 2015-11-16 23:41:46 +01:00
Laurent Destailleur
0e511027f6 Merge pull request #4003 from marcosgdf/bug-3996 
FIX #3996 Dictionnary hooks are not working in 3.8
 2015-11-16 23:41:06 +01:00
Laurent Destailleur
9693982f27 Merge pull request #4002 from marcosgdf/bug-3997 
FIX #3997 Wrong permission key used for Margins > Read all
 2015-11-16 23:40:47 +01:00
Laurent Destailleur
d16efbaf24 Merge pull request #3999 from fmarcet/3.8 
FIX: Can't update line's duration
 2015-11-16 23:39:44 +01:00
Alexis Algoud
a7d2bdc2c1 FIX 3.8 allow to search on alias name into select 2015-11-16 19:10:20 +01:00
phf
c21354101f FIX can not have access to the new ids or propal lines on PROPAL_CLONE 2015-11-16 15:36:02 +01:00
Marcos García de La Fuente
53fb085766 Corrected indent 2015-11-16 13:29:37 +01:00
Marcos García de La Fuente
ec7e4cb3d4 FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl 2015-11-16 13:25:00 +01:00
Marcos García de La Fuente
0880b13142 FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline 2015-11-16 13:24:11 +01:00
Marcos García de La Fuente
be460b6cbf FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be 2015-11-16 13:20:56 +01:00
Marcos García de La Fuente
8e9e2911ae FIX #3996 Dictionnary hooks are not working in 3.8 2015-11-16 13:18:25 +01:00
Marcos García de La Fuente
73da011461 FIX #3997 Wrong permission key used for Margins > Read all 2015-11-16 13:16:54 +01:00
fmarcet
0a92849de3 FIX: Can't update line's duration 2015-11-16 10:57:47 +01:00
aspangaro
06f752b250 Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy 2015-11-16 06:50:04 +01:00
Florian HENRY
c3b7bbfb3b FIX : #3990 2015-11-15 20:00:11 +01:00
Laurent Destailleur
6895daa5e9 Fix tr/td not correctly open/closed 
Fix default value was not set
 2015-11-14 19:31:50 +01:00
Laurent Destailleur
b4af55ab40 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-14 14:57:49 +01:00
Laurent Destailleur
b75923871c FIX: Too many information were hidden. A lot of users still need bank 
account on PDF.
 2015-11-14 14:56:44 +01:00
Laurent Destailleur
5b1e20494b Merge pull request #3977 from FHenry/3.8 
FIX : showrefnav htmlspecialchar instead of < >
 2015-11-13 19:22:41 +01:00
Laurent Destailleur
85c0ed39f1 Merge pull request #3974 from atm-ph/fix_38_aufocus 
FIX autofocus on input search product
 2015-11-13 19:21:52 +01:00
Florian HENRY
2a2155a239 FIX : showrefnav htmlspecialchar instead of < > 2015-11-13 14:40:52 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
bad28c6d92 Fi sntax error 2015-11-13 11:44:55 +01:00
Laurent Destailleur
eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-11-13 11:43:29 +01:00
Laurent Destailleur
c7546dbad2 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-13 11:13:04 +01:00
Laurent Destailleur
b3be7f65cd Fix syntax error . = instead of .= 2015-11-13 11:12:49 +01:00
phf
81a8933256 FIX autofocus on input search product 2015-11-13 10:36:32 +01:00
Laurent Destailleur
816bacc37e Merge pull request #3968 from atm-arnaud/3.8_fix_export_extrafield_propal_order 
FIX export propal and order with extrafields
 2015-11-12 18:31:59 +01:00
Laurent Destailleur
924db5b8aa Merge pull request #3969 from FHenry/3.8 
FIX : better fix for #3805
 2015-11-12 15:08:34 +01:00
Laurent Destailleur
8925717bbe Merge pull request #3966 from atm-ph/fix_38_title_actioncomm 
FIX mail isn't display in title on event in mode view
 2015-11-12 15:07:29 +01:00
Laurent Destailleur
9a9be97c2c Add a log to help diagnose bad usage of method ad of event 2015-11-12 14:36:35 +01:00
Regis Houssin
52bd90f950 Fix: wrong var name 2015-11-12 14:12:56 +01:00
Florian HENRY
019575d9ed FIX : better fix for #3805 2015-11-12 13:21:35 +01:00
arnaud
aaa6f00d11 FIX export propal and order with extrafields 2015-11-12 12:37:04 +01:00
phf
f041c017e9 FIX mail isn't display in title on event in mode view 2015-11-12 11:30:44 +01:00
Laurent Destailleur
b0419557b1 Exclude dir 2015-11-10 00:37:30 +01:00
Laurent Destailleur
98c32fa1ec FIX The label hidden was not supported when using jmobile 2015-11-10 00:36:33 +01:00
Laurent Destailleur
71fa347e8e FIX Better compatibility for users that used the not supported option 
MAIN_USE_JQUERY_MULTISELECT set to 1.
 2015-11-08 18:40:12 +01:00
Laurent Destailleur
e6ab6bdb8e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-08 14:38:01 +01:00
Laurent Destailleur
7a0206adce FIX Missing to set context into workflow actions, so triggers can't know 
we are creating an invoice from order or an order from a proposal.
 2015-11-08 14:37:50 +01:00
Juanjo Menent
0ce7cad48c Merge pull request #3946 from aspangaro/3.7-1 
Fix: Accountancy compatibility with subtotal & jalon module
 2015-11-08 11:26:06 +01:00
Juanjo Menent
7673a73a65 Merge pull request #3939 from marcosgdf/bug-3836 
FIX #3836 Unable to upload a document to an invoice under some circunstances
 2015-11-08 11:21:16 +01:00
Juanjo Menent
8377d6967a Merge pull request #3934 from marcosgdf/bug-3679 
FIX #3679 Error when deleting a Localtax2 special payment
 2015-11-08 11:16:07 +01:00
Juanjo Menent
a6f0baefc1 Merge pull request #3933 from marcosgdf/bug-3980 
FIX #3890 Expected transactions bank account page, shows negative numbers
 2015-11-08 11:15:31 +01:00
aspangaro
f0a3bca4c2 Fix: Accountancy compatibility with subtotal & jalon module 2015-11-08 04:22:49 +01:00
Florian HENRY
a4fafae109 FIX : Remove column creation for table llx_product_fournisseur_price, 
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
 2015-11-07 17:19:13 +01:00
Marcos García de La Fuente
4a52d3c1b1 Removed unwanted change 2015-11-07 15:35:00 +01:00
Marcos García de La Fuente
84a152dc2e FIX #3836 Unable to upload a document to an invoice under some circunstances 2015-11-07 15:33:48 +01:00
Marcos García de La Fuente
01854b3259 FIX #3679 Error when deleting a Localtax2 special payment 2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e FIX #3890 Expected transactions bank account page, shows negative numbers 2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
3bbedf1795 FIX #3707 Thirdparty bank account page table has a glitch 2015-11-07 13:39:34 +01:00
Marcos García de La Fuente
b4c3804c91 FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card 2015-11-07 13:21:03 +01:00
Florian HENRY
b0be2b04c7 FIX : #3912 2015-11-06 10:53:33 +01:00
Florian HENRY
f6b8c3a130 FIX : #3912 2015-11-06 10:50:08 +01:00
Florian HENRY
121d2beb80 fix spacing 2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca FIX : only active customer should be available into select list 
thirdparty on invoice creation
 2015-11-06 10:19:10 +01:00
Juanjo Menent
f33157033c Merge pull request #3909 from altatof/fixcloseshipping 
FIX: change object statut on close shipping and remove erratic db commit
 2015-11-06 10:16:00 +01:00
Christophe Battarel
4d11205a01 FIX: change object statut on close shipping and remove erratic db commit 2015-11-06 09:51:33 +01:00
Florian HENRY
600dbced7e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32 FIX : only active customer should be return into new invoice creation 
select list
 2015-11-06 09:49:02 +01:00
Laurent Destailleur
e78ebf041a Fix deprecated code not working in jcrop. $.browser.msie and $.browser 
is no more available in jquery 1.9+.
 2015-11-06 02:03:41 +01:00
Laurent Destailleur
58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
 2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/product/stock/fiche.php
	htdocs/product/stock/valo.php
 2015-11-05 22:04:18 +01:00
Laurent Destailleur
5777c16b72 Merge pull request #3902 from altatof/clonedorderdate 
FIX: change order date on clone (as everywhere else)
 2015-11-05 21:49:50 +01:00
Laurent Destailleur
fdf9617e42 Merge pull request #3900 from GPCsolutions/dolibarr-3864 
Fix #3864 Really fixed invalid jQuery code
 2015-11-05 21:47:40 +01:00
Laurent Destailleur
d499fafdb9 Merge pull request #3901 from altatof/3.6 
FIX bad calculation for stock value
 2015-11-05 21:44:21 +01:00
Christophe Battarel
316b7453e4 FIX bad stock valo 2015-11-05 17:04:08 +01:00
Christophe Battarel
80d2445540 FIX: bad stock valorisation 2015-11-05 17:00:22 +01:00
Christophe Battarel
ad82135879 FIX: change order date on clone (as everywhere else) 2015-11-05 15:36:13 +01:00
Christophe Battarel
75bcb7e53f fix pmp 2015-11-05 15:32:56 +01:00
Christophe Battarel
f566b38296 FIX pmp 2015-11-05 15:29:51 +01:00
Christophe Battarel
fa088eb6cc FIX bad calculation for stock value 2015-11-05 14:57:58 +01:00
Raphaël Doursenaud
b0cf9bd0be Fix #3864 Really fixed invalid jQuery code 2015-11-05 14:38:11 +01:00
Christophe Battarel
9b797c1831 FIX bad calculation for stock value 2015-11-05 12:49:43 +01:00
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or 
services
 2015-11-05 11:53:45 +01:00
Alexis Algoud
e1ea2215a3 FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch 2015-11-05 11:25:04 +01:00
Alexis Algoud
0543a31920 FIX event's data lost on user assign update 2015-11-05 11:11:03 +01:00
Laurent Destailleur
f319976e5d FIX #3878 Storing and deleting files on emailing was done at wrong place 
Conflicts:
	htdocs/comm/mailing/card.php
 2015-11-05 03:08:15 +01:00
Laurent Destailleur
14ec86047f Merge pull request #3886 from GPCsolutions/dolibarr-3805 
Fix #3805 Enhanced Facture::is_last_in_cycle()
 2015-11-05 02:33:48 +01:00
Laurent Destailleur
4bb21fd218 Merge pull request #3884 from FHenry/3.8 
FIX #3880
 2015-11-05 02:32:32 +01:00
Laurent Destailleur
f3421bcf6d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-05 01:13:23 +01:00
Laurent Destailleur
77371af35a FIX #3661 Margin is not selected correctly when adding a product 2015-11-05 01:08:30 +01:00
Raphaël Doursenaud
69ac75bef8 Fix #3864 Fixed invalid jQuery code 2015-11-04 22:55:14 +01:00
aspangaro
337643e53e Accountancy : Correct errors of display in bank journal 2015-11-04 22:31:24 +01:00
Raphaël Doursenaud
c534f5bcd5 Fix #3805 Enhanced Facture::is_last_in_cycle() 2015-11-04 20:35:20 +01:00
Florian HENRY
876ab4bb59 FIX : #3882 2015-11-04 18:30:09 +01:00
Florian HENRY
c0136daeb5 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-04 18:24:22 +01:00
Florian HENRY
d4ee183662 FIX : 3880 2015-11-04 18:21:59 +01:00
Laurent Destailleur
09f3cd6f1d Fix class cant be abstract 2015-11-04 16:43:24 +01:00
Laurent Destailleur
826cc6db1b Repair old deprecated data 2015-11-04 09:54:13 +01:00
Laurent Destailleur
df4f09e72f FIX #3240 2015-11-03 14:02:36 +01:00
Laurent Destailleur
74be7bf334 FIX Filter in customer price per product of a thirdparty returned error 2015-11-03 11:40:06 +01:00
Laurent Destailleur
ea0bf44670 The ckecksum file should not be into sources. Only into packages. 2015-11-03 09:43:39 +01:00
Frédéric FRANCE
e7ced32245 Fix Can't edit DictionaryRevenueStamp 2015-11-02 20:08:33 +01:00
Laurent Destailleur
d8796e4cc7 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
 2015-11-02 19:25:51 +01:00
Laurent Destailleur
958c3851d7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 19:17:32 +01:00
Laurent Destailleur
055fe5e275 FIX #3786 Translation of select box. 2015-11-02 19:17:22 +01:00
Laurent Destailleur
67a2f6ee91 Merge pull request #3854 from fmarcet/3.8 
FIX: Send emails to contacts who should not receive emails
 2015-11-02 18:03:59 +01:00