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

43046 Commits

Author SHA1 Message Date
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