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

39251 Commits

Author SHA1 Message Date
Raphaël Doursenaud
54b8aa8a0b Fixed typo in task export 
Closes #2607, #2609
 2015-04-14 19:14:16 +02:00
Laurent Destailleur
44f10ebec2 Fix: do not add new value 2015-04-13 13:01:23 +02:00
Laurent Destailleur
4aef43c14b Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-13 01:33:38 +02:00
Laurent Destailleur
584ca971b0 Fix #2600 2015-04-13 01:32:53 +02:00
Laurent Destailleur
c0ddfbfab7 Merge pull request #2597 from marcosgdf/bug-1906 
Fixes for bugs #1906 and #1905
 2015-04-13 01:04:23 +02:00
Marcos García de La Fuente
8f0c41dbd2 Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card 2015-04-12 22:02:25 +02:00
Marcos García de La Fuente
6173706531 Fix: [ bug #1906 ] Deplacement does not allow translated decimal format 2015-04-12 21:55:20 +02:00
Marcos García de La Fuente
9cfb295675 Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref 2015-04-12 21:05:26 +02:00
Marcos García de La Fuente
bbd01c0c8d Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project 2015-04-12 20:59:58 +02:00
Marcos García de La Fuente
728b64e334 Fix Bug #2583: Unable to create a bank transfer with localized numbers 2015-04-12 20:24:22 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Laurent Destailleur
1bf95b48c1 Fix remove warning when posting a vote 2015-04-12 11:45:50 +02:00
Laurent Destailleur
74a4bca42c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-11 22:52:27 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok. 
Works for canada and ivory cost.
 2015-04-11 22:51:53 +02:00
aspangaro
1f5ca497d3 Bug: Untranslated table header in /compta/bank/search.php 2015-04-09 20:50:19 +02:00
braito4
914b324a67 minor bug drag and drop total line in tasks list 2015-04-09 10:37:54 +02:00
Laurent Destailleur
ddde869ca4 Sync transifex 2015-04-08 21:35:27 +02:00
Laurent Destailleur
efb43a7015 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-08 20:40:19 +02:00
Laurent Destailleur
091420f8ae Close #2568 2015-04-08 20:40:01 +02:00
Laurent Destailleur
bb83eb0f68 Merge pull request #2561 from frederic34/patch-5 
Fix #2559 Bug: Untranslated "Total" in Bank module
 2015-04-07 23:50:17 +02:00
Juanjo Menent
d7ba9b3312 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/stock/mouvement.php
 2015-04-07 20:40:48 +02:00
Juanjo Menent
9d8cb459f1 Fix: Bad permission assignments for stock movements actions 2015-04-07 20:28:45 +02:00
Juanjo Menent
1ab70a7086 Solves #2542 Bug: Contracts store localtax preferences 
Conflicts:
	htdocs/compta/facture.php
 2015-04-07 20:05:56 +02:00
Juanjo Menent
35a6ed90a0 Solves #2542 Bug: Contracts store localtax preferences 2015-04-07 20:02:12 +02:00
Juanjo Menent
2dfaf08f61 Closes #2545 Bug: Missing object_margin.png in Amarok theme 
Conflicts:
	ChangeLog
 2015-04-07 18:54:38 +02:00
Juanjo Menent
345b609ff0 Closes #2545 Bug: Missing object_margin.png in Amarok theme 2015-04-07 18:41:40 +02:00
Frédéric FRANCE
06c749942a Update index.php 2015-04-07 18:40:19 +02:00
Frédéric FRANCE
7a2942684c Fix #2559 Bug: Untranslated "Total" in Bank module 2015-04-07 12:45:25 +02:00
Laurent Destailleur
a42eb7b787 Merge branch 'bug-2535' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2535 
Conflicts:
	ChangeLog
 2015-04-06 12:52:33 +02:00
Laurent Destailleur
8ce66aad79 Merge branch 'bug-2534' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2534 
Conflicts:
	ChangeLog
 2015-04-06 12:48:55 +02:00
Laurent Destailleur
d8b50722f3 Merge pull request #2548 from marcosgdf/bug-2540 
Close #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty
 2015-04-06 12:41:38 +02:00
Laurent Destailleur
f9608bf41d Merge pull request #2547 from marcosgdf/bug-2543 
Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract
 2015-04-06 12:38:54 +02:00
Marcos García de La Fuente
5c8e92d52a Closes #2535 Bug: Untranslated string in "Linked objects" page of a project 2015-04-04 17:52:05 +02:00
Marcos García de La Fuente
50091dfe8b Closes #2534 SQL error when editing a supplier invoice line 2015-04-04 17:44:52 +02:00
Marcos García de La Fuente
611406b75e Closes #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty 2015-04-04 17:34:06 +02:00
Marcos García de La Fuente
65f4a818d4 Merge branch '3.6' into bug-2543 2015-04-04 17:29:17 +02:00
Marcos García de La Fuente
40860a84d1 Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract 2015-04-04 17:28:24 +02:00
Florian HENRY
092dd38851 FIX : [ bug #1916 ] problème d'icone pour l'état "clos" sur les projets 2015-04-03 15:33:41 +02:00
Laurent Destailleur
b01369a32e Error management 2015-04-03 15:25:24 +02:00
Laurent Destailleur
98b1d6170d Fix style fieldrequired must be used only in create/edit mode. 2015-04-03 01:07:17 +02:00
Laurent Destailleur
761409caf6 Fix sql error 2015-04-02 15:17:07 +02:00
Laurent Destailleur
acbeb2b360 Fix en_GB 2015-04-02 14:03:52 +02:00
Laurent Destailleur
8d892e19c1 Sync from transifex 2015-04-02 13:56:32 +02:00
Laurent Destailleur
0f51314c7e Sync from transifex 2015-04-02 13:28:20 +02:00
Laurent Destailleur
5b190371ab Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-02 11:45:01 +02:00
Laurent Destailleur
f89d74d6bc Deletion of dir was not complete. 2015-04-02 11:44:43 +02:00
Laurent Destailleur
0187a9a4ee Merge pull request #2511 from fappels/3.7 
FIX: dispatch batch products
 2015-04-02 11:24:01 +02:00
Laurent Destailleur
f38212f20e Merge pull request #2508 from FHenry/3.6 
FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a specific year
 2015-04-02 11:22:18 +02:00
Laurent Destailleur
10f967e07a FIX #2519 2015-04-02 11:11:03 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make 
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
 2015-04-01 16:07:22 +02:00
Laurent Destailleur
ad1e4134a9 Fix: bcc was lost if notif to bcc was also forced 2015-04-01 12:22:50 +02:00
Laurent Destailleur
1bc0f6c99f Fix: do not show end date when it is same than start date 2015-04-01 12:02:32 +02:00
Laurent Destailleur
293495467f Fix: Bad ref used into notification message 2015-04-01 11:30:48 +02:00
Laurent Destailleur
5fe5ec939d Fix: delivery date must not be autofill with current date 2015-04-01 10:54:24 +02:00
Francis Appels
bba8b206a1 FIX: dispatch batch products 
Fix dispatching batch products and add error message.
Make DispatchProduct method backwards comp and add missing $trigger.
Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.
 2015-03-31 15:48:08 +02:00
Florian HENRY
104bbfdc1c Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-03-30 19:14:49 +02:00
Florian HENRY
65ec02bae1 FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a 
specific year
 2015-03-30 19:13:55 +02:00
Laurent Destailleur
fd8d09c8c0 Fix avoid warning 2015-03-29 17:53:05 +02:00
Laurent Destailleur
3cc4358e72 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/commande/liste.php
	htdocs/product/stock/product.php
 2015-03-29 15:24:17 +02:00
Laurent Destailleur
018a0d779f Fix translation 2015-03-29 15:18:10 +02:00
Laurent Destailleur
b8bd27009e Simplify code 2015-03-28 18:32:53 +01:00
Ion Agorria
043d11d785 check if $mc is a valid global 2015-03-28 18:22:01 +01:00
Laurent Destailleur
3f5fe432e7 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-28 17:18:10 +01:00
Laurent Destailleur
b60a56dc94 Fix search on command 2015-03-28 17:17:55 +01:00
Laurent Destailleur
e777516f38 Merge pull request #2483 from FHenry/3.7 
FIX : fetch actioncomm return 0 if no record found instead of nothing
 2015-03-27 01:10:28 +01:00
Laurent Destailleur
d0e4d8046b Merge pull request #2480 from marcosgdf/minor-2 
Corrected search box alignment in Customer orders list
 2015-03-27 01:09:06 +01:00
Laurent Destailleur
813cb36424 Merge pull request #2476 from fmarcet/3.7 
Fix: Not using where on sellist
 2015-03-27 00:50:48 +01:00
Florian HENRY
2e13479e8f Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-26 16:56:06 +01:00
Florian HENRY
26c29216d9 syntax 2015-03-26 16:55:13 +01:00
Laurent Destailleur
42c2c81e28 Fix detection of html was wrong with img 2015-03-26 12:05:52 +01:00
Laurent Destailleur
1ca95acbd7 Fix pb during export of agenda events 
Conflicts:
	htdocs/exports/export.php
 2015-03-26 11:23:21 +01:00
Marcos García de La Fuente
e59fed9f38 Corrected search box alignment in Customer orders list 2015-03-26 11:08:34 +01:00
Laurent Destailleur
8be08c692f Fix some secuity tests were not done. 2015-03-25 18:10:45 +01:00
Maxime Kohlhaas
b250c5588e Fix : Quantity displayed for virtual stock explanations was wrong 2015-03-25 16:11:36 +01:00
fmarcet
456b11d148 Fix: Not using where on sellist 2015-03-25 11:23:05 +01:00
Laurent Destailleur
f75c115140 Fix translation 
Fix permission not managed into get_menudiv.php
 2015-03-24 11:19:51 +01:00
Fab
ea7f00e777 Fix displaying of the warning image. 
Since last commit, $objp->date_livraison returns nothing ; max() will
then returns wrong result, and the warning image will be displayed when it
should not.
 2015-03-23 20:05:31 +01:00
Laurent Destailleur
dc0d3504dd Fix: Bad notification key 2015-03-23 14:52:47 +01:00
Laurent Destailleur
b7a466c95f Fix bad style for total 2015-03-23 13:50:14 +01:00
Laurent Destailleur
5d2e09ec51 Fix: navigation in page was wrong and typo errors. 2015-03-23 12:31:32 +01:00
Laurent Destailleur
7ad0a32559 Fix for multicompany users. 2015-03-23 04:51:24 +01:00
Laurent Destailleur
e269aa83b5 More comments 2015-03-23 04:16:58 +01:00
Laurent Destailleur
042556a9cf Better comments 2015-03-23 03:50:55 +01:00
Laurent Destailleur
f4b1d95b3e Some fix for multicompany module 2015-03-23 02:39:41 +01:00
Laurent Destailleur
87da1d734e mysql 5.5.41 is still bugged returning "lost connexion" during migration 
but there is no more data loss so we can allow this version. A database
upgrade to 5.6 will be required if this occurs.
 2015-03-22 12:13:26 +01:00
Laurent Destailleur
4f9aef6150 Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:29:23 +01:00
Laurent Destailleur
73266bb965 Fix error when using a log hangler that make output into the http 
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
 2015-03-21 01:22:05 +01:00
Laurent Destailleur
b8ed553365 We must keep the @, some tools use it to know it is login page. 2015-03-21 01:08:29 +01:00
Laurent Destailleur
33d98b52b5 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-20 20:51:50 +01:00
Laurent Destailleur
eeb09b83a1 The test on db version must not lock the phpunit 2015-03-20 20:50:46 +01:00
Laurent Destailleur
9e0aa22a04 Merge pull request #2461 from tiaris/3.7_langs_error 
Add global $langs to method, necessary for triggers to function
 2015-03-20 20:43:16 +01:00
Laurent Destailleur
0784e9638a The test on db version must not lock the phpunit 2015-03-20 17:57:40 +01:00
Laurent Destailleur
b0e928c213 Disable migration with bugged versions 2015-03-20 15:26:00 +01:00
Marcos García de La Fuente
56295ed438 Fixed delivery date in order list not showing up 2015-03-20 11:28:23 +01:00
Laurent Destailleur
d442ac328c Fix: some replacement tags were missing 2015-03-19 12:34:03 +01:00
Laurent Destailleur
a2676e5768 Fix: the type of notification sent was not filled 2015-03-18 21:06:55 +01:00
Laurent Destailleur
7ef11b2f38 Fix selected attribute not set correctly 2015-03-18 13:16:59 +01:00
Laurent Destailleur
37c216cfe4 Fix limit for very slow os. 2015-03-17 15:43:11 +01:00
jean
9e9a8894ea Add global $langs to method, necessary for triggers to function 
correctly
 2015-03-17 14:20:08 +01:00
Laurent Destailleur
04c88b0d94 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-16 18:26:07 +01:00
Laurent Destailleur
bc4ecf8619 Fix the debug option must works for admin user 2015-03-16 18:25:26 +01:00
Laurent Destailleur
60c72e13b3 Some fixes into export and translation 2015-03-15 23:39:53 +01:00
Laurent Destailleur
c4ff66c5d7 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-03-14 13:46:18 +01:00
Laurent Destailleur
89b22be063 FIXED: Allowed 0 to be used as an account mask. Required by CEGID. 2015-03-14 13:44:26 +01:00
Laurent Destailleur
ca34575df4 FIXED: Allowed 0 to be used as an account mask. Required by CEGID. 2015-03-14 13:42:00 +01:00
Laurent Destailleur
5670e92842 Position of field into pdf baleine 2015-03-14 12:35:03 +01:00
Laurent Destailleur
5146936708 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-14 12:04:18 +01:00
Laurent Destailleur
605a7dee0e Fix: Deleting task do not return to correct page 2015-03-14 11:56:28 +01:00
Juanjo Menent
851cae80a2 Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line 
159
 2015-03-14 10:16:50 +01:00
Juanjo Menent
4ae1106ffb Fix: Showing system error if not enough stock of product into orders 
creation with lines

Conflicts:
	htdocs/commande/class/commande.class.php
 2015-03-14 09:50:38 +01:00
Juanjo Menent
7cab558ed2 Fix: Showing system error if not enough stock of product into orders 
creation with lines
 2015-03-14 09:44:58 +01:00
Laurent Destailleur
0ef2369399 Enhance tools to make transifex sync 2015-03-14 02:37:18 +01:00
Laurent Destailleur
7a877e9cfb Restore correct keys 2015-03-14 00:51:12 +01:00
Laurent Destailleur
a8e7d90ea3 Sync transifex 2015-03-13 22:02:53 +01:00
Laurent Destailleur
d056abc4e1 No need to have this protected. Property can be read with method show() 
and this method can be override.
 2015-03-13 21:45:52 +01:00
Laurent Destailleur
bc3f9bf800 Fix: the visible version was not enough to know version of dolibarr. We 
also need the MAIN_FEATURES_LEVEL.
 2015-03-13 18:11:31 +01:00
Laurent Destailleur
51c877e32c Hide a feature that is really not stable. So i move it as a "develop" 
feature.
 2015-03-13 18:03:21 +01:00
Laurent Destailleur
f75749cc2b Sync transifex 2015-03-13 17:43:04 +01:00
Laurent Destailleur
a452823e1e Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility 
with 3.6
 2015-03-13 15:20:08 +01:00
Laurent Destailleur
895b2c6e9c Fix bad merge 2015-03-13 14:37:27 +01:00
Laurent Destailleur
dfe1ee7e7d Fix: count of notification emails was wrong 2015-03-13 14:11:59 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
 2015-03-11 03:29:52 +01:00
Laurent Destailleur
41b09d8c70 Merge pull request #2448 from atm-maxime/3.6 
Fix : display proposal date on proposal list
 2015-03-11 02:50:26 +01:00
Laurent Destailleur
6f39270450 Merge pull request #2310 from FHenry/3.7 
re-add index.html file
 2015-03-11 02:29:29 +01:00
Laurent Destailleur
0ff2a0ad9f Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1825-37

Conflicts:
	htdocs/comm/action/index.php
 2015-03-11 02:26:01 +01:00
Laurent Destailleur
734a7dd5c7 Merge pull request #2443 from biznext/patch-4 
Fix Anchor link for quick access when editing.
 2015-03-11 02:13:29 +01:00
Laurent Destailleur
154865f545 Fix return error when it is not 2015-03-10 16:37:39 +01:00
Laurent Destailleur
0df2b4cc26 Fix check parameters 2015-03-10 16:14:46 +01:00
Maxime Kohlhaas
05a2a6af00 FIX : [bug #1900] Unable to remove a salary with enough permissions 2015-03-10 15:53:02 +01:00
Maxime Kohlhaas
154e1a7991 Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2015-03-10 15:14:25 +01:00
Maxime Kohlhaas
978dc8170d Fix : display proposal date on proposal list 2015-03-10 14:56:58 +01:00
Laurent Destailleur
d847f9581e Fix generation of RUM number. Show it on card to help debug. 2015-03-10 11:31:23 +01:00
Raphaël Doursenaud
f8dfa61859 FIXED #1901: Inverted supplier order/invoice buttons in project referring objects 2015-03-09 16:20:51 +01:00
Florian HENRY
15dfd7c08d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-09 10:52:09 +01:00
Estephe L.
9d320e4268 Fix Anchor link for quick access when editing. 
This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
 2015-03-08 23:29:09 +01:00
Laurent Destailleur
a169b3348e Fix show alays date fields for contract module. 
Fix select of product were lost.
 2015-03-06 14:36:22 +01:00
Laurent Destailleur
77dd07c846 Fix thumbs generation 2015-03-06 13:12:33 +01:00
Florian HENRY
0d801be6a1 NEW: (Dev) DolGraph allow extended class to override $_stringtoshow 2015-03-06 06:12:47 +01:00
Laurent Destailleur
22045603b7 Fix bad update of denormalized field 2015-03-05 13:51:29 +01:00
Laurent Destailleur
9c12c325db Fix regression into enable/disable external calendars 2015-03-05 11:46:03 +01:00
Laurent Destailleur
6c1c1fd691 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/agenda.lib.php
	htdocs/fourn/paiement/fiche.php
 2015-03-05 11:35:39 +01:00
Laurent Destailleur
35a0575aad Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-05 11:22:34 +01:00
Laurent Destailleur
dc15eee533 Fix: missing dependcy on project to check before deleting 2015-03-05 11:21:58 +01:00
Marcos García de La Fuente
c9b3cab22b Mytasks is not clickable 2015-03-05 10:22:33 +01:00
Marcos García de La Fuente
d549030078 Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) 2015-03-05 10:20:32 +01:00
Laurent Destailleur
5f9f536f0b Merge pull request #2417 from marcosgdf/bug-1892 
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
 2015-03-04 22:01:37 +01:00
fmarcet
1a02f6aa80 Fix: Masks works with thirdparty type 2015-03-04 18:18:55 +01:00
Laurent Destailleur
081875c4d9 Merge pull request #2383 from aspangaro/3.7-patch4 
FIXED: Remove condition to show accountancy field on user.
 2015-03-04 18:02:09 +01:00
Marcos García de La Fuente
41c55d1913 Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value 2015-03-04 11:55:17 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
Laurent Destailleur
35733c4c08 More comments 2015-03-03 17:47:17 +01:00
Laurent Destailleur
7050ef6176 Fix parameter notolderthan was not effective 2015-03-02 17:56:37 +01:00
Laurent Destailleur
79023cddb0 Fix external calendar for users were not visible if no global calendar 
was set.
 2015-03-02 17:34:50 +01:00
Marcos García de La Fuente
77605bce3e [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment 2015-03-02 13:33:31 +01:00
Florian HENRY
d80a8bbdba revert bug1840 to eldy solution 2015-03-02 10:13:06 +01:00
Florian HENRY
d9621a1d23 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	htdocs/contrat/card.php
 2015-03-02 10:02:54 +01:00
Laurent Destailleur
48356005c3 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-02 03:00:29 +01:00
Laurent Destailleur
3475433eaf Fix: the bank information were visible into pdf but were not using 
correct setup to decide which bank to show.
 2015-03-02 02:59:59 +01:00
Marcos García de La Fuente
7876238823 Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) 
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
 2015-03-02 01:36:27 +01:00
Laurent Destailleur
ce8cbee5d2 Merge pull request #2399 from marcosgdf/misc 
misc
 2015-03-02 00:31:27 +01:00
Laurent Destailleur
6d3381bfa0 Merge pull request #2398 from marcosgdf/deprecated 
Marked getStaticMember as deprecated
 2015-03-02 00:23:36 +01:00
Laurent Destailleur
8a67a3af10 Fix missing one param 2015-03-01 16:12:55 +01:00
Laurent Destailleur
8a00109baf Fix: Several bugs int replenishment feature. 2015-03-01 16:05:20 +01:00
Laurent Destailleur
5f29942257 Fix link missing icon 2015-03-01 14:03:14 +01:00
Laurent Destailleur
9b0dce2e34 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/agenda.lib.php
 2015-03-01 13:58:56 +01:00
Laurent Destailleur
be033c1947 Fix bad position of html tags 
Conflicts:
	htdocs/opensurvey/card.php
 2015-03-01 13:54:24 +01:00
Laurent Destailleur
a421564b84 Fix phpcs 2015-03-01 13:52:58 +01:00
Laurent Destailleur
f8e9a38e5c Fix: Avoid empty table into setup when module are missing. 2015-02-28 19:37:44 +01:00
Laurent Destailleur
7baaf18ad1 Fix can be null 2015-02-28 18:44:06 +01:00
Laurent Destailleur
1c9eec1a17 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-28 18:18:58 +01:00
Laurent Destailleur
1cdd77a671 Fix: use bad var 2015-02-28 18:18:41 +01:00
Juanjo Menent
8c6ee6b7a8 Trad: Syncro from transifex 2015-02-27 18:20:35 +01:00
Juanjo Menent
88d1d203d8 Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:13:24 +01:00
Juanjo Menent
7ca8fdb20c PHP norms 2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47 Fix: Bad SEPA xml file creation 2015-02-27 17:55:15 +01:00
aspangaro
8f388aaa9b Merge remote-tracking branch 'Upstream/3.7' into 3.7-patch4 2015-02-26 20:48:21 +01:00
aspangaro
47c41f6a85 Add a test to enable field only when module salary is used 2015-02-26 20:47:06 +01:00
Laurent Destailleur
828716420b Comment of function was not correct 2015-02-26 16:19:45 +01:00
Laurent Destailleur
d6438a51ab Add log to help track bug 2015-02-26 15:24:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Laurent Destailleur
fe7889e266 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:03:17 +01:00
Laurent Destailleur
386eaf0911 Fix: bad sql request 2015-02-26 12:11:31 +01:00
Marcos García de La Fuente
fb959abc63 Misc PHPdoc fixes 2015-02-25 18:24:36 +01:00
Marcos García de La Fuente
0a5f17f179 Undefined variable + Unreachable statement 2015-02-25 18:06:54 +01:00
Marcos García de La Fuente
91fa823075 Marked getStaticMember as deprecated 2015-02-25 18:03:31 +01:00
Laurent Destailleur
be529e7269 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-25 16:53:33 +01:00
Laurent Destailleur
76640b6b77 Fix removed warning 2015-02-25 15:01:25 +01:00
Laurent Destailleur
3fb3e4af4e Merge pull request #2386 from lrq3000/3.7 
Fix lastrowid-*table* option when defining imports
 2015-02-24 17:16:17 +01:00
Laurent Destailleur
72da9b52af Merge pull request #2380 from marcosgdf/bug-1825 
Better fix for bug 1825
 2015-02-24 17:07:17 +01:00
Laurent Destailleur
625c494dee Merge pull request #2385 from aspangaro/3.7-patch5 
FIXED: Bankjournal is generated from id_account now
 2015-02-24 17:04:01 +01:00
Laurent Destailleur
74f15680e1 Fix missing fields into import of thirdparties. 
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
 2015-02-24 15:40:50 +01:00
Laurent Destailleur
44c392ca23 Fix missing profid5 and 6 2015-02-24 13:35:37 +01:00
Laurent Destailleur
9842e816d0 Fix bad sql type 
Fix no input outside tr-td
 2015-02-24 11:24:15 +01:00
Laurent Destailleur
0a5c3e1fa8 Fix price must be hidden if context is not on sell 2015-02-23 23:15:41 +01:00
Laurent Destailleur
4128c86035 Fix: Filter on statut was lost 2015-02-23 19:31:42 +01:00
Laurent Destailleur
d3a79c8724 Fix default entity guess 2015-02-23 14:44:24 +01:00
Laurent Destailleur
570194b4b9 Fix validation of email when there is a comma separator. 2015-02-23 13:10:18 +01:00
Laurent Destailleur
ae8d090ebe Fix No default filter by default, we miss data 2015-02-23 11:43:38 +01:00
Laurent Destailleur
dbaef5ca6b Fix link does not return same number that nmber into link 2015-02-23 01:00:07 +01:00