Laurent Destailleur
|
4e4efc97f0
|
Merge branch 'marcosgdf-bug-1776' into 3.6
|
2015-10-11 19:54:51 +02:00 |
|
Laurent Destailleur
|
c76af687ed
|
Merge pull request #3715 from marcosgdf/clone-proposals
FIX 1794 Error when cloning Proposal gives error in a malformed page
|
2015-10-11 19:52:30 +02:00 |
|
Laurent Destailleur
|
1acaf44acf
|
Merge pull request #3718 from hregis/3.8_bug
Fix: wrong files name
|
2015-10-11 19:48:25 +02:00 |
|
Laurent Destailleur
|
a9a3c3b97f
|
Exclude file from sources. It is generated when building package.
|
2015-10-11 19:47:47 +02:00 |
|
Laurent Destailleur
|
a8e52f9c54
|
Update filelist
|
2015-10-11 19:45:53 +02:00 |
|
Regis Houssin
|
f8f600828d
|
Fix: wrong files name
|
2015-10-11 19:18:03 +02:00 |
|
Marcos García de La Fuente
|
fd9f51df88
|
Missing changelog
|
2015-10-11 12:39:42 +02:00 |
|
Marcos García de La Fuente
|
4e9a378f0d
|
Merge branch '3.6' into bug-1776
|
2015-10-11 12:37:41 +02:00 |
|
Marcos García de La Fuente
|
9f1fa7e212
|
Missing changelog
|
2015-10-11 12:32:02 +02:00 |
|
Marcos García de La Fuente
|
252f00dfe7
|
Merge branch '3.6' into clone-proposals
|
2015-10-11 12:29:45 +02:00 |
|
Laurent Destailleur
|
3f8e9bd181
|
Remove warning
|
2015-10-10 19:24:31 +02:00 |
|
Laurent Destailleur
|
7b7d27920d
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/adherents/type.php
htdocs/categories/class/categorie.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/tax.lib.php
htdocs/product/composition/card.php
|
2015-10-10 18:56:28 +02:00 |
|
Laurent Destailleur
|
384c89dcef
|
Merge pull request #3701 from altatof/fix_orderdateonclone
FIX: change order date on clone (as everywhere else)
|
2015-10-09 20:44:03 +02:00 |
|
Laurent Destailleur
|
856bfaaa3a
|
Merge pull request #3691 from FHenry/3.8
FIX : Always use type send in parameters in showCategories method
|
2015-10-09 20:39:28 +02:00 |
|
Laurent Destailleur
|
4fab809604
|
Merge pull request #3684 from aspangaro/3.8-21
Fix : Lines from ER show date in english format
|
2015-10-09 20:38:29 +02:00 |
|
Laurent Destailleur
|
279e7028fb
|
Merge pull request #3686 from grandoc/3.7
3.7
|
2015-10-09 20:38:16 +02:00 |
|
Laurent Destailleur
|
f9485bd25b
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/extrafields.class.php
|
2015-10-09 20:35:17 +02:00 |
|
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
|
e886c89e06
|
Merge pull request #3668 from altatof/fix_stock_entity
fix entities warehouse share
|
2015-10-09 20:16:32 +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 |
|
Christophe Battarel
|
00f0aff6f0
|
FIX: change order date on clone (as everywhere else)
|
2015-10-08 15:58:19 +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
|
8f5d9597f8
|
Merge pull request #3675 from GPCsolutions/3.7-3666
Fixes for checkbox extrafields
|
2015-10-07 14:31:30 +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
|
f3ef9b868f
|
fix entities warehouse share
|
2015-10-05 16:19:54 +02:00 |
|
Christophe Battarel
|
bf262c2cae
|
reenable search criteria in sql clause
|
2015-10-05 15:41:28 +02:00 |
|