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
fmarcet
99c4508029 Fix: Bug in the new photo system 2015-04-27 16:44:12 +02:00
Laurent Destailleur
50a6c133c9 Fix error management 2015-04-27 11:46:30 +02:00
Laurent Destailleur
92f2c48475 Fixed #2714 2015-04-27 11:46:08 +02:00
Laurent Destailleur
ce05837237 Translation 2015-04-27 09:55:59 +02:00
Laurent Destailleur
2e05a4f1be Fix #2713 2015-04-27 03:21:55 +02:00
Laurent Destailleur
aa9bffe5c9 Fix translation 2015-04-27 02:34:15 +02:00
Laurent Destailleur
7b9d9c4d0a Fix lang 2015-04-26 16:25:02 +02:00
Laurent Destailleur
13b4d86064 Better fix for #2709 2015-04-24 21:29:02 +02:00
Laurent Destailleur
d925e552ca Merge pull request #2709 from atm-alexis/3.7 
FIX event not linked to contact on creation
 2015-04-24 21:23:50 +02:00
Laurent Destailleur
de74bbed3a Merge pull request #2702 from atm-gauthier/3.7 
FIX : display linked object in edit mode when we create an event from an...
 2015-04-24 21:10:02 +02:00
Laurent Destailleur
788ec8cd88 Merge pull request #2698 from fappels/3.7 
FIX: can show print page after product save
 2015-04-24 21:08:20 +02:00
Alexis Algoud
7d3482036d FIX event not linked to contact on creation 2015-04-24 17:40:53 +02:00
Laurent Destailleur
d47b9a759a FIX migration error 2015-04-24 00:33:02 +02:00
Gauthier
58008cef94 NEW : display linked object in edit mode when we create an event from an order, propal... 2015-04-23 16:28:29 +02:00
Laurent Destailleur
1fcf10fd8a Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-23 13:55:08 +02:00
Laurent Destailleur
c97c5e0cfd Fix selection of user was lost 2015-04-23 13:54:49 +02:00
Juanjo Menent
1ed573f98b Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in 
commande.class.php on line 852
 2015-04-22 23:31:24 +02:00
Francis Appels
93d9321088 FIX: can show print page after product save 
Add product id to form action to be able show print page from product
card after save.
 2015-04-22 23:27:09 +02:00
Laurent Destailleur
47ecb91a3e Avoid DOS attack when high number of tasks 2015-04-22 21:17:49 +02:00
Laurent Destailleur
7f5377d219 Fix #2695 2015-04-22 19:25:20 +02:00
Laurent Destailleur
12d841f27d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-22 14:58:39 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Marcos García de La Fuente
ad5dd8e70f [ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on 2015-04-20 01:36:48 +02:00
Maxime Kohlhaas
54a68116e4 Fix : prevelement with SEPA 2015-04-19 01:55:35 +02:00
Laurent Destailleur
b7ffdba55f Merge remote-tracking branch 'origin/3.6' into 3.7 2015-04-19 01:00:48 +02:00
Maxime Kohlhaas
5a66e1f98a Fix : include facture class for outstanding bill 2015-04-19 00:26:05 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/expedition/fiche.php
 2015-04-18 23:55:17 +02:00
Laurent Destailleur
ed6abb0f79 Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2576 
Conflicts:
	ChangeLog
 2015-04-18 20:56:27 +02:00
Laurent Destailleur
b7cf0ded00 Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2577 
Conflicts:
	ChangeLog
 2015-04-18 20:12:27 +02:00
Maxime Kohlhaas
7b035d3b5f Fix : menu financial was not displayed when only supplier module is activated 2015-04-18 20:11:19 +02:00
Laurent Destailleur
9b69b64626 Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583 
Conflicts:
	ChangeLog
 2015-04-18 20:10:06 +02:00
Laurent Destailleur
4201cf9f7f Merge pull request #2638 from atm-maxime/fix_cust_outstanding 
Fix cust outstanding
 2015-04-18 18:56:23 +02:00
Maxime Kohlhaas
51522decf3 Fix : price in editkeyval function was forcing a price rounding 2015-04-18 18:33:46 +02:00
Maxime Kohlhaas
8b307aac56 Fix : customer outstanding was not calculated properly 2015-04-18 18:06:27 +02:00
Maxime Kohlhaas
e0af2feced Fix : on impayees remain to pay did not include deposits 2015-04-18 18:06:02 +02:00
jean
8006edc278 correct issue 2589 getting user signature in script, when user is sended 
through a script parameter
 2015-04-18 16:39:53 +02:00
Laurent Destailleur
7c8bb14fe4 Merge pull request #2628 from marcosgdf/bug-2579 
Fix Bug #2579: Bad display duration enter data on intervention
 2015-04-18 15:11:32 +02:00
Juanjo Menent
459737e171 Merge pull request #2625 from marcosgdf/bug-2601 
Fix bug #2601 Supplier orderstoinvoice does not work with PostgreSQL
 2015-04-18 15:03:01 +02:00
Juanjo Menent
5203d5ead0 Merge pull request #2626 from marcosgdf/bug-2598 
Fix bug #2598 Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php
 2015-04-18 14:58:25 +02:00
Marcos García de La Fuente
de494b2904 Fix Bug #2579: Bad display duration enter data on intervention 2015-04-18 11:25:15 +02:00
Maxime Kohlhaas
2b8efc302a Fix : shipment model selection 2015-04-18 11:24:55 +02:00
Marcos García de La Fuente
b5ed65f838 Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php 2015-04-18 10:50:07 +02:00
Marcos García de La Fuente
9fee7a9827 Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL 2015-04-18 10:30:58 +02:00
Maxime Kohlhaas
7223495ac2 Fix : date_delivery was not a datetime 2015-04-18 04:21:16 +02:00
Maxime Kohlhaas
1ad610130a Fix : shipment list sql request and delivery display 2015-04-18 01:09:16 +02:00
Maxime Kohlhaas
3073aab48b Fix : discount were not working anymore on supplier order and bill 2015-04-17 23:31:51 +02:00
Florian HENRY
32e067c806 Remove debug 2015-04-16 14:22:48 +02:00
Laurent Destailleur
e508b28d74 Fix doliforge bug 1707 2015-04-15 18:53:39 +02:00
Laurent Destailleur
8511f1f7ef Fix the data-role parameter 2015-04-15 18:14:26 +02:00
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