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

44758 Commits

Author SHA1 Message Date
Regis Houssin
0b25601307 Fix: wrong object name 2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf Fix: missing signature and uniformize code between card and script 2016-02-08 12:20:40 +01:00
Florian HENRY
2991084061 fx accountancy 2016-02-08 10:50:40 +01:00
philippe grand
a15d03a676 fix : Strict Standards: Only variables should be passed by reference 2016-02-08 10:06:32 +01:00
Laurent Destailleur
c4c7ea2f22 FIX Relative discount decimals are not saved 2016-02-08 02:49:19 +01:00
aspangaro
eaca582cb5 Fixed: Problem of merging - Review page init accountancy again 2016-02-07 08:47:02 +01:00
aspangaro
9d427d2248 Fixed: Missing link in eldy menu to init accountancy 2016-02-07 07:41:53 +01:00
Laurent Destailleur
84f4f2d40f FIX The search on user/group was not using new code. Fiels used for 
search was not visible.
 2016-02-07 02:55:56 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
c6fe8e5479 Fix first install on debian. 2016-02-06 17:13:24 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
58f728eae5 Prepare 3.9rc 2016-02-06 15:11:45 +01:00
Laurent Destailleur
806d3642d8 FIX Bad filter on opportunities 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2016-02-06 15:09:57 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +01:00
Laurent Destailleur
96bf59f065 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 19:21:59 +01:00
Christophe Battarel
7a6c7f10a6 FIX: add missing global def for ttc column 2016-02-05 19:14:40 +01:00
Laurent Destailleur
36a29872b1 Merge pull request #4559 from fmarcet/3.8 
FIX: Check stock of batch on shippment
 2016-02-05 18:41:01 +01:00
Laurent Destailleur
7044e62afa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 18:37:13 +01:00
Laurent Destailleur
bf7181a064 All messages separated with , into errorsToString 2016-02-05 18:37:01 +01:00
Laurent Destailleur
02c54f4ea6 Merge pull request #4573 from altatof/fix_ttc 
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
 2016-02-05 18:34:45 +01:00
Christophe Battarel
f0aef88589 better fix 2016-02-05 13:49:19 +01:00
Christophe Battarel
36c7697b63 FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 
3.7
 2016-02-05 13:43:06 +01:00
fmarcet
ede4453164 Fix: Avoid errors when batch stock is negative 2016-02-05 12:59:32 +01:00
fmarcet
01f2180822 Merge remote-tracking branch 'origin/3.8' into 3.8 2016-02-05 12:57:43 +01:00
Laurent Destailleur
713050bd57 Fix style on payment page 2016-02-05 12:46:41 +01:00
Laurent Destailleur
062deae24c Merge 2016-02-05 12:18:50 +01:00
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
0ae8a3398d Fix sql error when extrafields on contact 2016-02-05 10:56:45 +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
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
f4d04b8f26 FIX part of #4227 2016-02-03 02:41:07 +01:00
Laurent Destailleur
6f1ddd3ba4 Fix on ref not correctly initialized. 2016-02-03 02:29:19 +01:00
Laurent Destailleur
d85f7be1f5 FIX #4423 2016-02-03 02:06:12 +01:00
Laurent Destailleur
165771b652 FIX #4439 2016-02-03 01:46:30 +01:00
Laurent Destailleur
229199aaad FIX #4497 2016-02-03 01:32:50 +01:00
Laurent Destailleur
ee4b437bff Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-03 01:20:23 +01:00
Laurent Destailleur
bbf15d6a5d FIX #4498 2016-02-03 01:20:06 +01:00
Laurent Destailleur
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
Laurent Destailleur
1548be2614 Merge pull request #4549 from FHenry/3.9 
Accountancy module
 2016-02-02 17:15:01 +01:00
Laurent Destailleur
325c35d355 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-02 15:39:44 +01:00
Laurent Destailleur
43ac8b72a3 Merge pull request #4542 from aspangaro/3.9-p9 
New accountancy menu for auguria
 2016-02-02 15:32:32 +01:00
Laurent Destailleur
687afeaffe FIX No project fields if module disabled 2016-02-02 15:09:01 +01:00
Florian HENRY
c1f084b448 Fix accountancy 2016-02-02 11:11:08 +01:00
Florian HENRY
2887eb8c70 fix accountancy 2016-02-02 11:02:58 +01:00
Florian HENRY
22ce2872ac Fix journal 2016-02-02 11:01:15 +01:00
Florian HENRY
564594c3d7 Fix accountancy 2016-02-02 10:58:12 +01:00
Florian HENRY
48b191b1ff Fix tuff into accountancy 2016-02-01 15:08:01 +01:00
Florian HENRY
65162ae8e9 Accountancy modules 2016-02-01 14:59:13 +01:00
Florian HENRY
165b553a79 Format code 2016-02-01 14:50:25 +01:00
Laurent Destailleur
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +01:00
Laurent Destailleur
640adcc666 Missing translation 2016-01-31 21:23:30 +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
7b15ac1179 Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:44:09 +01:00
aspangaro
2fa01a1754 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9 2016-01-31 07:33:57 +01:00
aspangaro
c77fda5128 New accountancy menu for auguria 2016-01-31 07:31:48 +01:00
Laurent Destailleur
9a87d2bee5 Fix phpcs 2016-01-30 16:28:48 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +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
129f5aad8e Fix bad translation 2016-01-30 15:56:04 +01:00
mic9p
8faeac611a Do not select siren but tva_intra from societe 
VAT report by customer shows an empty field.
 2016-01-30 15:35:28 +01:00
Laurent Destailleur
6e69e99227 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:34:06 +01:00
Laurent Destailleur
5212303208 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-30 15:29:52 +01:00
Laurent Destailleur
d21908755e FIX Import/Export NPR VAT 2016-01-30 15:29:35 +01:00
Laurent Destailleur
cc7d105d88 Fix height in mapping impot step 2016-01-30 15:07:22 +01:00
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6 
Fix: Some problems presentation on accountancy module
 2016-01-30 13:04:22 +01:00
Laurent Destailleur
09a24b8dd8 Merge pull request #4496 from frederic34/patch-9 
Text not initialized
 2016-01-30 12:24:40 +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
c77fcfd291 Merge pull request #4503 from fmarcet/3.9 
FIX: Not returning the correct multilevel price
 2016-01-30 12:05:32 +01:00
Laurent Destailleur
f79b1d06cb Merge pull request #4519 from FHenry/3.9 
FIX : set column paid on expense report when expense is paid
 2016-01-30 12:01:10 +01:00
Laurent Destailleur
e2d9989574 Merge pull request #4518 from FHenry/3.9_compta 
3.9 compta
 2016-01-30 12:00:20 +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
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
bobby
72e8680f7c FIX : set column paid on expense report when expense is paid 2016-01-28 13:57:40 +01:00
bobby
6aa6c067fb fix travis 2016-01-28 13:24:38 +01:00
bobby
283412f489 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-28 13:12:57 +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
Laurent Destailleur
2141a2f8a1 Fix css 2016-01-28 12:44:04 +01:00
phf
6eecf2f29a FIX filter by socid if from customer card 2016-01-28 12:30:49 +01:00
Laurent Destailleur
83e8efa910 Fix picto private project was same than public project 2016-01-28 12:19:19 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
c09fa6e0dd Fix empty keys are not allowed into select 2016-01-28 12:19:06 +01:00
Laurent Destailleur
c8d232e056 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/card.php
 2016-01-28 12:18:25 +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
fmarcet
e3d8a9a8a4 FIX: Doesn't collect the value of the cost price correctly 2016-01-27 12:13:31 +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
fmarcet
eec8d30625 FIX: Not returning the correct multilevel price 2016-01-27 10:57:04 +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
d33548e32c Fix in md theme 2016-01-25 17:31:40 +01:00
Laurent Destailleur
0f70ccad50 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-25 15:39:16 +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
Frédéric FRANCE
9909918078 Text not initialized 2016-01-25 13:52:35 +01:00
bobby
71c407e670 add coala book keeping export 2016-01-25 12:43:47 +01:00
bobby
c286c4c6ec Accoutancy update 2016-01-25 12:39:21 +01:00
aspangaro
73d5e7036f Refactoring eldy menu to test 2016-01-24 08:21:18 +01:00
aspangaro
e5808f876d Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6 2016-01-24 07:04:20 +01:00
Marcos García de La Fuente
83263e242e Corrected typo of PR #4444 2016-01-23 20:32:22 +01:00
bobby
50d2665b0e Fix travis 2016-01-23 19:42:40 +01:00
bobby
4dd56c52d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-23 19:39:33 +01:00
Laurent Destailleur
615ffe5417 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-23 12:28:34 +01:00
Laurent Destailleur
a841db1eeb FIX Purge of temp files was broken 2016-01-23 12:24:46 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +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
3903ced5b4 Fix: link to add at wrong place 2016-01-23 11:30: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
f2f4c60dbd Merge pull request #4469 from aspangaro/3.9-p8 
Fix: Commercial index presentation - missing $var=!$var when we have no data
 2016-01-22 04:15:22 +01:00
Laurent Destailleur
a406334643 Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification 
FIX line refetch incompatible with hook practice
 2016-01-22 04:10:06 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +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
d857b3475b Fix doxygen 2016-01-22 03:07:46 +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
cd71d53ffd Merge pull request #4422 from marcosgdf/patch-2 
Corrected wrong translation
 2016-01-22 02:11:46 +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
Laurent Destailleur
4e87afddf1 Fix: why a floating float here ? 2016-01-21 22:44:05 +01:00
bobby
57035ace24 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-21 17:09:00 +01:00
Laurent Destailleur
b5c047d9a5 Fix link on project ref on task list must jump to tab task 2016-01-21 15:15:26 +01:00
Laurent Destailleur
39aede4071 Fix bad list of project/tasks 2016-01-21 15:09:46 +01:00
Laurent Destailleur
dd6e60630d Fix size of cells make page too large even for large screen 2016-01-21 15:01:53 +01:00
Laurent Destailleur
3c68ac55b9 Fix missing loading lang 2016-01-21 15:00:39 +01:00
aspangaro
8a36bda3d2 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p8 2016-01-21 05:46:11 +01:00
aspangaro
192c58f10d Fix: Commercial index presentation - missing $var=!$var when we have no data 2016-01-21 05:44:53 +01:00
Alexis Algoud
48d674578b FIX line is refetch (and seems useless) unless it was modified by the hook previous calling 2016-01-19 11:54:07 +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
6eb6b0315f Fix bad field used for search on start date 2016-01-18 16:47:14 +01:00
Laurent Destailleur
17ceca3758 Fix: no create button on list 2016-01-18 16:44:04 +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
bobby
71a46567ac DEV : Accounting module 2016-01-15 10:44:16 +01:00
bobby
cd8a59f35a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-15 10:01:24 +01:00
Marcos García
ca6c2b4317 Update products.lang 2016-01-15 09:49:52 +01:00
Laurent Destailleur
cb24f2b372 Fix missing type in list 2016-01-15 01:52:16 +01:00
Laurent Destailleur
6acd31f8ad Fix: style required in create or edit mode only 2016-01-15 00:44:38 +01:00
bobby
19bec6b0b3 Manual merge from 3.8 backported 2016-01-14 18:24:02 +01:00
Laurent Destailleur
a0fc26fbd8 Fix missing orde by 2016-01-14 17:09:59 +01:00
Laurent Destailleur
b5f057051b Fix: Missing param into link 2016-01-14 15:45:05 +01:00
Laurent Destailleur
0951042dad Fix: no need of translation tab if multilang was disabled. 2016-01-14 15:00:31 +01:00
Laurent Destailleur
b8b84c67a6 Fix bad setting of default actioncode 2016-01-14 14:15:14 +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
ef7061a575 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and 
SOCIETE_DISABLE_CUSTOMERS
 2016-01-14 12:49:23 +01:00
Laurent Destailleur
23dd6b8388 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and 
SOCIETE_DISABLE_CUSTOMERS
 2016-01-14 12:35:55 +01:00
Laurent Destailleur
ecb4661155 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-14 11:23:11 +01:00
Laurent Destailleur
63ebd40ceb Fix bad var value 2016-01-14 11:22:59 +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
Laurent Destailleur
7b4ebb498e Merge pull request #4415 from fappels/3.9-4409 
Fix #4409 totals not shown in stock/list
 2016-01-14 11:07:47 +01:00
Laurent Destailleur
a8148b8b40 FIX Bug: Delivery order and date are not displayed #4372 2016-01-13 20:56:20 +01:00
Laurent Destailleur
55a056a449 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-13 20:41:47 +01:00
Laurent Destailleur
71b264dd86 FIX Bug: Delivery order and date are not displayed #4372 
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
 2016-01-13 20:41:32 +01:00
fappels
f150676908 Fix #4409 totals not shown in stock/list 2016-01-13 16:33:51 +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
2c24094d60 Fix bad tab on bad home area page 2016-01-13 13:54:11 +01:00
Laurent Destailleur
9ba25be9bb Change category for application 2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b Fix missing default setup when module is enabled 2016-01-13 13:36:44 +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
0f53c49673 Merge pull request #4392 from aspangaro/3.9-p5 
Fix: HRM index typo and presentation
 2016-01-12 23:00:06 +01:00
Laurent Destailleur
233dc051a1 Merge pull request #4384 from hregis/3.9_bug 
Fix: Gives the possibility to the module, to provide his own family info
 2016-01-12 22:59:43 +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
Laurent Destailleur
64026c41f8 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-12 22:03:34 +01:00
Laurent Destailleur
d7fdcc83bb Fix missing search criteria 2016-01-12 22:03:19 +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
aspangaro
880a794acd Merge remote-tracking branch 'Upstream/3.9' into 3.9-p5 2016-01-10 19:54:38 +01:00
Laurent Destailleur
bf09800540 Fix function signature 2016-01-10 18:52:26 +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
aspangaro
a88773cb81 Fix: Some problems presentation on accountancy module 2016-01-10 15:44:14 +01:00
aspangaro
47f63172e3 Fix: HRM index typo and presentation 2016-01-10 14:58:54 +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
Regis Houssin
694530bfae Fix: Gives the possibility to the module, to provide his own family info 
and position of this family. (canceled $this->family)
 2016-01-10 13:00:48 +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
70ffcfea33 Merge pull request #4380 from aspangaro/3.9-p4 
Fix: Donation some problems with french article
 2016-01-10 11:46:12 +01:00
Laurent Destailleur
d8001a8e7a Merge pull request #4379 from aspangaro/3.9-p3 
Fix: SQL error on user bank tab
 2016-01-10 11:45:40 +01:00
Laurent Destailleur
ffe80a36e1 Merge pull request #4378 from aspangaro/3.9-p1 
Fix: Add missing key language for propal
 2016-01-10 11:43:54 +01:00
Laurent Destailleur
c22bc8a29e Merge pull request #4377 from aspangaro/3.9-p2 
Fix: Wrong language file for 2 menu entries in accountancy module
 2016-01-10 11:38:21 +01:00
Laurent Destailleur
aa0b002119 Fix #4354 2016-01-10 11:35:06 +01:00
Laurent Destailleur
fddd02eecc Complete fix #4354 2016-01-10 11:31:22 +01:00
aspangaro
965a96784c Fix: Donation some problems with french article 2016-01-10 07:35:00 +01:00
aspangaro
87f1e55bcb Fix: SQL error on user bank tab 2016-01-10 07:08:49 +01:00
aspangaro
af9e46d179 Fix: Wrong language file for 2 menu entries in accountancy module 2016-01-10 06:56:20 +01:00
aspangaro
e82f7761bc Merge remote-tracking branch 'Upstream/3.9' into 3.9-p1 2016-01-10 06:26:42 +01:00
Laurent Destailleur
2764fb240f Fix text color for category tags 
Fix banner for category translation tab
 2016-01-10 00:11:49 +01:00
aspangaro
3ff9fe3123 Fix: Add missing key language for propal 2016-01-09 08:26:08 +01:00
Laurent Destailleur
b2924885aa Fix css 2016-01-09 03:00:12 +01:00
Laurent Destailleur
a8758fa5b7 Bug war week-end: Fix a duplicate page on holiday, fix missing badge on 
some documents tabs.
 2016-01-09 01:54:46 +01:00
Laurent Destailleur
0d8788e552 FIX It was not possible to define if leave type need to be followed by a 
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
 2016-01-09 01:18:53 +01:00
Laurent Destailleur
e79750dc89 I continue bug war week-end 2016-01-09 00:44:06 +01:00
Laurent Destailleur
e5d0bc9d57 Fix permission not used 2016-01-09 00:34:15 +01:00
Laurent Destailleur
06c97b931b Fix css 2016-01-09 00:06:16 +01:00
Laurent Destailleur
37c106acff Fix search on shipment 2016-01-08 23:59:02 +01:00
Laurent Destailleur
99f3870ee6 Fix no picot if no warehouse set 
Fix search on warehouse
 2016-01-08 23:54:40 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
Laurent Destailleur
127354f0af Minor fixes 2016-01-08 22:41:30 +01:00
Laurent Destailleur
f9933aba0c Install style match application style 2016-01-08 22:23:57 +01:00
Laurent Destailleur
c9176cd6b4 Missing translation 2016-01-08 18:22:41 +01:00
Laurent Destailleur
de36db19bc Fix do not show warehouse for shipment on not predefined product 2016-01-08 18:15:53 +01:00
Laurent Destailleur
b6895c7c1f Fix: a badge css was found into an array 2016-01-08 17:23:25 +01:00
Laurent Destailleur
87c236b534 Fix when error creating invoice from predefined invoice, we must go back 
to create page from same predefined invoice.
 2016-01-08 16:30:43 +01:00
Laurent Destailleur
20f1455090 FIX #4314 2016-01-08 15:45:23 +01:00
Laurent Destailleur
2259cf2340 Merge remote-tracking branch 'origin/3.8' into develop 2016-01-08 14:49:00 +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
844e8bff83 Better fix for #4354 2016-01-08 14:22:21 +01:00
Laurent Destailleur
6a058edc23 Revert "Debug of module leave requests " 2016-01-08 14:15:22 +01:00
Laurent Destailleur
cce473b2cb Merge pull request #4354 from T-B-A-I/patch-1 
Debug of module leave requests
 2016-01-08 14:13:08 +01:00
Laurent Destailleur
d4aa83e7ca Merge pull request #4343 from grandoc/develop 
translations
 2016-01-08 14:07:05 +01:00
Laurent Destailleur
36dc8b1ce7 FIX #4341 2016-01-08 13:57:53 +01:00
Laurent Destailleur
5785744d5a Add ignore 2016-01-08 13:06:38 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late 
to use them. Will be done into 4.0
 2016-01-08 13:05:56 +01:00
Raphaël Doursenaud
f2178f0369 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-08 06:42:28 +01:00
TBAI
8c48785de7 Debug of module leave requests 
Add text in holiday module
 2016-01-07 20:10:22 +01:00
TBAI
f28ebefe93 Debug of module leave requests 
Cancel leave isn't possible if it has been validated
 2016-01-07 19:53:59 +01:00
TBAI
b2aa1f2115 Debug of module leave requests 
Cancel leave isn't possible if it has been validated
 2016-01-07 19:32:25 +01:00
Laurent Destailleur
3c5eaf87d5 Fix dol_fiche_head and end missing 2016-01-07 18:48:46 +01:00
Laurent Destailleur
0eae624a60 Add protection to avoid packaging external tested modules 2016-01-07 18:13:15 +01:00
Laurent Destailleur
befe58ab98 Fix selection of first entry into select 2016-01-07 13:44:19 +01:00
Laurent Destailleur
b3cb037abb Neutral color 2016-01-07 11:43:53 +01:00
Laurent Destailleur
4e2d4a6651 Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible. 
Solved this by completing tooltip info.
 2016-01-07 11:01:37 +01:00
philippe grand
7b7f2e9fed translations 2016-01-07 10:07:05 +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
Laurent Destailleur
9200a4b69d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-07 00:05:39 +01:00
Laurent Destailleur
2945d2d171 Fix bad condition to show tabs 2016-01-07 00:05:28 +01:00
Laurent Destailleur
a974fa858d Merge pull request #4328 from frederic34/patch-8 
Indentation
 2016-01-06 18:51:55 +01:00
Laurent Destailleur
d6c5a73264 Fix missing payment fields definition in export 2016-01-06 17:37:01 +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
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
b2c41d8565 Fix search forms 2016-01-03 18:46:10 +01:00
Laurent Destailleur
abe3f192fa Debug and fix when using dolibarr with jmobile 2016-01-03 16:23:23 +01:00
Marcos García de La Fuente
ae2295d019 Improvement suggested by @eldy 2016-01-03 15:10:22 +01:00
Laurent Destailleur
96e5651ed5 Fix missing field on list. Restor ability to search on supplier ref. 2016-01-03 14:38:47 +01:00
Laurent Destailleur
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Frédéric FRANCE
998649d467 Indentation 2016-01-02 18:51:31 +01:00
Laurent Destailleur
d02c261d2e Fix perf test was using a not existing js file. 2016-01-02 18:13:41 +01:00
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
 2016-01-02 12:27:08 +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
Laurent Destailleur
5b305249a6 Merge pull request #4327 from braito4/patch-1 
FIX #4326 PHP7 Warning
 2016-01-02 11:56:54 +01:00
Laurent Destailleur
04c5516483 Fix the format "dayall" does not exists. Instead add missing format 
"_locale" using correct language file.
 2016-01-02 11:51:40 +01:00
braito4
9b3533e753 FIX #4326 PHP7 Warning 2016-01-02 11:42:43 +01:00
Laurent Destailleur
865d93b19e Merge pull request #4324 from defrance/patch-93 
Add rfc and dayall format for extrafields date
 2016-01-02 11:39:42 +01:00
Laurent Destailleur
273f3678bc Fix no ?> at end of php files 2016-01-02 00:32:22 +01:00
Laurent Destailleur
1ae4bef04b Fix conflict with the div #dialog used for popup cut and paste of 
address.
 2016-01-02 00:27:14 +01:00
Laurent Destailleur
a7b2f000d8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-01 23:44:35 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
BENKE Charlie
dbb8e49654 Update commondocgenerator.class.php 2016-01-01 12:47:27 +01:00
BENKE Charlie
b1aba4b93b Add rfc and dayall format for extrafields date 2015-12-31 18:50:28 +01:00
phf
fffc8a430d FIX call trigger LINEBILL_SUPPLIER_CREATE 2015-12-31 15:48:16 +01:00
Laurent Destailleur
2cbcbb8f85 Merge pull request #4319 from ParisLiakos/develop 
FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
 2015-12-31 15:04:16 +01:00