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

42607 Commits

Author SHA1 Message Date
Laurent Destailleur
b27989d5d4 Merge pull request #3665 from altatof/fix_extrafields 
reenable search criteria in sql clause
 2015-10-09 20:32:42 +02:00
Laurent Destailleur
c675f88dda Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning 
[Qual] Prevent warning
 2015-10-09 20:29:24 +02:00
Laurent Destailleur
dea095dbf7 Merge pull request #3710 from GPCsolutions/3.8-rmdebug 
Fix: remove debugging leftover
 2015-10-09 20:19:41 +02:00
Laurent Destailleur
53c9cb38ef Merge pull request #3664 from FHenry/3.7 
FIX : New adherent from, always redirect on entity
 2015-10-09 20:15:23 +02:00
Laurent Destailleur
be9027df1a Merge pull request #3687 from grandoc/3.8 
syntax error
 2015-10-09 20:14:08 +02:00
Raphaël Doursenaud
497c751fb9 Fix: remove debugging leftover 2015-10-09 16:24:42 +02:00
Florian HENRY
1f2a86078a FIX : Always use type send in parameters in showCategories method 2015-10-08 11:03:08 +02:00
philippe grand
0841feda47 syntax error 2015-10-08 09:40:00 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
philippe grand
6cce2860c2 Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7 2015-10-08 09:12:36 +02:00
aspangaro
425e7ce808 Fix : ER Show date in english format 2015-10-07 22:31:23 +02:00
Laurent Destailleur
72cabe2fc3 More complete description of margin rules calculation 2015-10-06 19:27:48 +02:00
Laurent Destailleur
8426e2e506 FIX Can't reopen a canceled invoice. 2015-10-06 18:38:43 +02:00
Laurent Destailleur
c460873c85 FIX The filter on thirdparty prices should be visible if there is at 
least one thirdparty price.
 2015-10-06 17:13:35 +02:00
Laurent Destailleur
1f742c7464 FIX Add a test to save life when ref of object (invoice ref, order ref, 
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
 2015-10-06 16:38:27 +02:00
Laurent Destailleur
d4a85d9fba Fix missing css 2015-10-06 16:12:09 +02:00
Laurent Destailleur
e776f685ba FIX when editing time spent, date of line suggested was a rubbish value 2015-10-06 16:09:24 +02:00
Laurent Destailleur
6ea05aa311 FIX Bad translation key for project "Overview" 2015-10-06 16:03:47 +02:00
Raphaël Doursenaud
c208fccf35 [Qual] Prevent warning 
calcul_price_total() prefers to have the seller and localtaxes specified
 2015-10-06 15:03:59 +02:00
Laurent Destailleur
d92604f646 FIX Link of project must be cickable if user has permission to read all 
projects
FIX Missing information into the alt of project picto
 2015-10-06 00:46:26 +02:00
Laurent Destailleur
53d86e1661 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-05 23:54:13 +02:00
Laurent Destailleur
9f2bcf0e4f FIX The admin flag is mising. 2015-10-05 23:53:49 +02:00
Laurent Destailleur
f1cf629b80 FIX List of project for user that are restrited as sale repreentative to 
some thirdparties.
 2015-10-05 23:52:54 +02:00
Raphaël Doursenaud
afbee44993 Fix #3667 checkbox extrafields on edit 
For actions and members.
 2015-10-05 20:51:43 +02:00
Raphaël Doursenaud
3fdd59bf0a Fix #3666 checkbox extrafields on edit 2015-10-05 20:39:14 +02:00
Raphaël Doursenaud
41354ca00d Added type hinting to extrafields object 2015-10-05 20:30:55 +02:00
Raphaël Doursenaud
d24f5538f9 Fix: wrong parameters order 2015-10-05 20:25:55 +02:00
Laurent Destailleur
e3f225e038 FIX bad link into project box 2015-10-05 19:41:41 +02:00
Christophe Battarel
bf262c2cae reenable search criteria in sql clause 2015-10-05 15:41:28 +02:00
Florian HENRY
9dd4a23365 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-10-05 15:22:38 +02:00
Florian HENRY
c9d8e041d5 FIX : New adherent from, always redirect on entity 2015-10-05 15:20:55 +02:00
philippe grand
78cb31e55f Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7 2015-10-05 14:50:30 +02:00
Laurent Destailleur
143c1e03f8 FIX Missing menu entry for list of thirdparties when using auguria menu 
manager
 2015-10-05 10:30:49 +02:00
Laurent Destailleur
7b2fbdd638 FIX Can't change the admin with default setup 2015-10-05 10:04:34 +02:00
Laurent Destailleur
c20296f963 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-10-04 20:46:17 +02:00
Laurent Destailleur
839d4c2a9a Merge pull request #3650 from frederic34/patch-19 
Update printing.php
 2015-10-04 20:03:21 +02:00
Laurent Destailleur
c2cc9711f7 FIX Thirdparty is missing on card 2015-10-04 20:01:08 +02:00
Frédéric FRANCE
780a5a1996 Update files.lib.php 2015-10-04 19:59:26 +02:00
Laurent Destailleur
406b271275 Merge pull request #3635 from FHenry/3.7 
FIX : Mass Mailing activity don't display all status
 2015-10-04 19:57:29 +02:00
Laurent Destailleur
0df42bc5ea FIX Filter on status of thirdparty list and bad encoding of url 2015-10-04 19:37:49 +02:00
Laurent Destailleur
75e337e8d9 FIX select of project using ajax autocomplete option 2015-10-04 16:02:50 +02:00
Juanjo Menent
8f28e7cf1c Merge remote-tracking branch 'upstream/3.8' into 3.8 2015-10-03 23:34:37 +02:00
Juanjo Menent
8febf25c23 Fix: #3566 2015-10-03 23:34:10 +02:00
Laurent Destailleur
d737fd1fd2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-03 19:06:44 +02:00
Laurent Destailleur
31acab92a6 Doc comments 2015-10-03 18:48:51 +02:00
Juanjo Menent
fbc3efb5a9 Merge pull request #3641 from grandoc/3.8 
fix : Typo
 2015-10-03 15:55:56 +02:00
Laurent Destailleur
a9e55fd08f FIX Missing contracts into list in page of Refering objects of a 
thirdparty.
 2015-10-03 12:57:58 +02:00
philippe grand
d19a9f66b3 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2015-10-03 12:43:38 +02:00
Laurent Destailleur
996c9ca2ba FIX Can't change state on a contact 2015-10-03 12:21:27 +02:00
Laurent Destailleur
b6a83ed5a6 FIX Can't delete thirdparty if there is some discounts 2015-10-03 12:20:50 +02:00
Frédéric FRANCE
322a2a54b8 Update printing.php 2015-10-03 11:34:14 +02:00
Laurent Destailleur
10b481f47f Fix colspan 2015-10-03 11:15:12 +02:00
Laurent Destailleur
5acf961f23 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-03 00:10:19 +02:00
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Juanjo Menent
4c1e018ded Merge pull request #3621 from fmarcet/3.8 
FIX Only are showing one object linked
 2015-10-02 11:03:19 +02:00
Laurent Destailleur
f11fd22809 More accurate message 2015-10-01 22:27:02 +02:00
Laurent Destailleur
5ad665d00c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-01 16:50:52 +02:00
Laurent Destailleur
60c0338d64 FIX #3628 2015-10-01 16:50:18 +02:00
Laurent Destailleur
e76124add5 FIX #3606 2015-10-01 16:09:51 +02:00
Florian HENRY
fd29bb34be FIX : Mass Mailing activity don't display all status 2015-10-01 16:09:04 +02:00
Laurent Destailleur
4201e8b032 FIX #3630 - Wrong balance report when module salaries and donation 
disabled
 2015-10-01 14:38:31 +02:00
Laurent Destailleur
e2a88cd010 Merge pull request #3626 from GPCsolutions/3.8-3607 
FIX #3607 Better categories setting and unsetting
 2015-10-01 13:59:05 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Laurent Destailleur
076f2ed9d1 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/security.lib.php
 2015-10-01 11:10:47 +02:00
Laurent Destailleur
72c31c0fa9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-10-01 10:48:28 +02:00
Laurent Destailleur
4da8fb901b Add comment 2015-10-01 10:48:09 +02:00
Laurent Destailleur
1907e5da54 Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat 
FIX facturestat bad sql when customer view is limited
 2015-10-01 10:48:05 +02:00
Laurent Destailleur
34adc60d26 Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company 
FIX error in SQL due to a previous fix
 2015-10-01 10:35:07 +02:00
Laurent Destailleur
9c28894ec3 Merge pull request #3615 from FHenry/3.7 
FIX : When delete actioncomm also delete actioncomm_resources
 2015-10-01 10:34:54 +02:00
Laurent Destailleur
0c64fa04bc Merge pull request #3614 from marcosgdf/bug-3572 
FIX #3572 Impossible to attach project in order. The option to use autocompletion for project failed.
 2015-10-01 10:32:32 +02:00
Laurent Destailleur
9901406634 A paswword can be set on member card but member can't login. Too much 
work to fix this into a stable version, so I just introduce a warning to
explain why and how to solve this.
 2015-10-01 10:15:07 +02:00
Laurent Destailleur
71ccdb5cfb FIX Payment form for paypal and paybox was not centered. 2015-09-30 19:37:41 +02:00
Laurent Destailleur
747c49862c Try to solve a flush pb 2015-09-30 19:15:45 +02:00
Laurent Destailleur
7037679718 FIX When update a member login for a member linked to a user, the login 
of user was not sync (not updated).
 2015-09-30 19:15:09 +02:00
Raphaël Doursenaud
f0466ba313 FIX #3607 Better categories setting and unsetting 
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
 2015-09-30 18:47:02 +02:00
Florian HENRY
a96b92a618 FIX : Email selector contact must not include inactive contact 2015-09-30 14:06:45 +02:00
Laurent Destailleur
d59f62cd75 Sync transifex 2015-09-30 01:25:35 +02:00
Laurent Destailleur
673ce059e6 Fix locale for nl_BE must match netherland language 2015-09-29 23:55:38 +02:00
Florian HENRY
e209fb23a2 FIX : Admin fiche inter page do not take good action 2015-09-29 18:27:39 +02:00
Florian HENRY
fecd213bb8 FIX: display error on extrafields on ficheinter 2015-09-29 16:57:05 +02:00
Florian HENRY
bb0de1dcad FIX : update2.php test res befre assign it 2015-09-29 15:00:11 +02:00
Florian HENRY
766b8535ae spacing 2015-09-29 09:47:23 +02:00
Florian HENRY
4f5e207f08 review 2015-09-29 09:45:04 +02:00
Laurent Destailleur
c05df2ab7e FIX Wizard for restore does not show import command 2015-09-29 09:11:13 +02:00
fmarcet
a585698b69 FIX: Only are showing one object linked 2015-09-29 08:49:11 +02:00
arnaud
0b7305d21a FIX facturestat bad sql when customer view is limited 2015-09-28 16:55:34 +02:00
Alexis ALGOUD
453ed8a05e FIX error in SQL due to a previous fix 2015-09-28 15:36:27 +02:00
Florian HENRY
0f27edad5d FIX : When delete actioncomm also delete actioncomm_resources 2015-09-28 10:14:19 +02:00
Marcos García de La Fuente
188489c8ef FIX #3572 Impossible to attach project in order 
Added missing file of commit 65d3f79

Close #3572
 2015-09-27 21:52:44 +02:00
Laurent Destailleur
fa9103fc97 FIX Bad title line in project view when using jmobile 2015-09-27 16:50:47 +02:00
Laurent Destailleur
1e2d06bcd1 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-27 16:02:44 +02:00
Laurent Destailleur
ff5f823bef FIX not responsive part for project page 2015-09-27 16:01:57 +02:00
Grand Philippe
6f128907fe fix : Missing argument 1 for CommonDocGenerator::__construct() 2015-09-27 11:30:23 +02:00
philippe
1454d942ef missing translation 2015-09-27 11:06:45 +02:00
Laurent Destailleur
e1b969cb90 FIX Init into bad var 2015-09-26 16:52:58 +02:00
Laurent Destailleur
6aa13d4189 Fix the $colorbackvmenu2 was removed with 3.8 2015-09-26 16:34:43 +02:00
Laurent Destailleur
d119e04963 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 14:17:02 +02:00
Laurent Destailleur
9ecc8e5e6b FIX Regression on bad use of fk_account showing the bad bank account on 
PDF.
 2015-09-26 14:11:39 +02:00
Laurent Destailleur
dd88a799fb FIX Event from ical stream should not be movable into calendar view 2015-09-26 13:54:50 +02:00
Laurent Destailleur
c707c899c1 Fix remove warning 2015-09-26 13:22:05 +02:00
Laurent Destailleur
fef8203e65 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 12:01:58 +02:00
Laurent Destailleur
a3647bea4e Fix bad information in report 2015-09-26 11:53:36 +02:00
Laurent Destailleur
5a2dc88d42 Merge pull request #3610 from defrance/patch-80 
3.8 bad filtering caused by statut filter #3580
 2015-09-26 11:20:54 +02:00
Laurent Destailleur
b99ef6b27c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 11:05:12 +02:00
Laurent Destailleur
4e77a651d4 Merge pull request #3600 from fmarcet/3.8 
FIX #3599 Not saving legal form
 2015-09-26 11:05:02 +02:00
Laurent Destailleur
9644e242ae Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 11:04:32 +02:00
Laurent Destailleur
5f765419ea Fix because project module introduced opportunity, user may create 
project (opportunity) even when thirdparty does not exists yet, so we
must provide a solution for this.
 2015-09-26 11:04:17 +02:00
Laurent Destailleur
f3ba115ef0 Fix missing default value 2015-09-26 10:53:59 +02:00
Laurent Destailleur
7424b521ed Merge pull request #3609 from aspangaro/3.8-20 
Fix centering on login page
 2015-09-26 10:30:24 +02:00
BENKE Charlie
8dcd6158e3 3.8 bad filtering caused by statut filter #3580 
correction ported on 3.8 too, sorry for the bad step process
 2015-09-26 10:15:42 +02:00
Juanjo Menent
b8bf21b905 Merge pull request #3582 from grandoc/3.8 
FIX: order ref must not be translated
 2015-09-26 08:54:25 +02:00
aspangaro
df0e64eb7c Fix centering on login page 2015-09-26 07:59:06 +02:00
Laurent Destailleur
9d0cd148a8 Fix duplicate log 2015-09-25 11:47:24 +02:00
Laurent Destailleur
dcf3c00023 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-25 11:28:59 +02:00
Laurent Destailleur
c0433928c6 FIX sortder field was missing so manually added values were moved to 
begin.
 2015-09-25 11:28:49 +02:00
fmarcet
b5b90d1639 FIX #3599 Not saving legal form 2015-09-25 08:50:00 +02:00
Laurent Destailleur
3ee5920947 Merge pull request #3571 from fmarcet/3.8 
FIX: When filter with empty status, by default get canceled status (-1)
 2015-09-24 18:40:06 +02:00
philippe
9e185eec75 FIX: order ref must not be translated 2015-09-24 15:29:17 +02:00
Laurent Destailleur
f8f1f4fd2b Merge branch 'patch-2' of https://github.com/AlainRnet/dolibarr into 
AlainRnet-patch-2

Conflicts:
	htdocs/categories/categorie.php
 2015-09-23 18:29:56 +02:00
tysauron
f3a28682ea For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE 2015-09-23 18:26:50 +02:00
phf
b222800012 FIX clone customer order create new order with validate ref and not with PROV 2015-09-23 15:14:08 +02:00
Florian HENRY
206d6d0f7e FIX : avoid SQL error in getValueFrom common object when all params are 
not send
 2015-09-23 13:17:58 +02:00
Florian HENRY
84fa92045c FIX : avoid SQL error when no sortfield send to method 2015-09-23 12:10:38 +02:00
Alexis Algoud
2d35124c71 FIX no need to remove file into mail form, the temp dir will be deleted after any sending 2015-09-23 11:11:19 +02:00
Laurent Destailleur
12a08ae4e1 Prepare 3.8.1 2015-09-23 10:25:06 +02:00
fmarcet
3ff8b3e437 FIX: Error retrieving customer prices 2015-09-23 10:23:29 +02:00
fmarcet
8309ed5c12 FIX: When filter with empty status, by default get canceled status (-1) 2015-09-23 09:24:49 +02:00
Laurent Destailleur
a70e73a963 FIX Missing validate button if permission are not valid. 2015-09-23 01:08:23 +02:00
tysauron
f1ab0d36c5 Chmod new file not old file 2015-09-23 00:32:30 +02:00
Laurent Destailleur
00b858e644 Merge pull request #3564 from FHenry/3.8 
FIX : remove twice same test
 2015-09-23 00:07:28 +02:00
Laurent Destailleur
dc89e6c516 Merge pull request #3557 from hregis/3.8 
Fix: use get instead getJSON for avoid freezing
 2015-09-22 23:56:36 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
 2015-09-22 16:28:34 +02:00
Laurent Destailleur
90b78702e5 Update ignore to secure packaging 2015-09-22 16:23:51 +02:00
Laurent Destailleur
c125ba0d66 Update ignore to secure 
Conflicts:
	htdocs/.gitignore
 2015-09-22 15:42:59 +02:00
Laurent Destailleur
75daddbbe2 Update ignore to secure 2015-09-22 15:40:49 +02:00
Florian HENRY
178208918f FIX : remove twice same test 2015-09-22 12:03:11 +02:00
Laurent Destailleur
c2bdd9b465 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-22 11:29:49 +02:00
Laurent Destailleur
fe6af7d8eb FIX Description of tags was mandatory in edit mode but not in create 
mode. Should not be mandatory.
 2015-09-22 11:29:26 +02:00
AlainRnet
30bfb0eee3 Update categorie.php 
voir https://github.com/Dolibarr/dolibarr/pull/3562
 2015-09-22 09:40:13 +02:00
Laurent Destailleur
f2e2edbc64 FIX not closing CSS. 2015-09-21 15:10:52 +02:00
Laurent Destailleur
7d4a9b17b6 FIX Creation of tables or keys must not be done with a random order. 2015-09-21 14:00:02 +02:00
Regis Houssin
de04f3022c Fix: use get instead getJSON for avoid freezing 2015-09-20 09:05:52 +02:00
aspangaro
49f671eb1d Correct name 2015-09-19 07:24:32 +02:00
aspangaro
1901b2fb3b Missing translations in checks deposits exports 2015-09-19 07:15:13 +02:00
Laurent Destailleur
e85ddbb470 Merge pull request #3537 from GPCsolutions/3.8-3533 
FIX #3533 Load categories language
 2015-09-18 20:48:58 +02:00
Laurent Destailleur
378da082bd Fix selector or margin with jmobile 2015-09-18 20:43:10 +02:00
Laurent Destailleur
5f507cbbd8 Fix missing closing div making jmobile crazy 2015-09-18 20:23:06 +02:00
Laurent Destailleur
8699776930 Better usability with dolidroid 2015-09-18 16:17:52 +02:00
Laurent Destailleur
e974b07b09 Fix javascript error 2015-09-18 16:05:38 +02:00