Marcos García de La Fuente
280ecf1243
Merge remote-tracking branch 'upstream/3.6' into changelog
2014-07-23 06:25:21 +02:00
Marcos García de La Fuente
f31f0cc0a9
Updated changelog for 3.6
2014-07-23 06:25:12 +02:00
Juanjo Menent
8cd2e00e5f
Fix: [ bug #1521 ] The second order's page from a provider shows all
...
orders
2014-07-21 16:57:08 +02:00
Laurent Destailleur
9acf60d7c5
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
.travis.yml
ChangeLog
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/html.formfile.class.php
2014-07-14 23:36:10 +02:00
Laurent Destailleur
f55814e3b2
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2014-07-14 23:11:33 +02:00
Juanjo Menent
3a8835892e
Fix: Import ProfId1 to siren and ProfId2 to siret
...
Conflicts:
ChangeLog
2014-07-14 19:42:54 +02:00
Juanjo Menent
3816e0fe14
Fix: Import ProfId1 to siren and ProfId2 to siret
2014-07-14 19:39:08 +02:00
Marcos García de La Fuente
4bc8e026b6
[ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly
2014-07-13 19:51:44 +02:00
juanjo
c1bfe0f6c5
Update ChangeLog: Remove add_photo_web()
2014-07-11 22:00:41 +02:00
Florian HENRY
7d77772820
changelog
2014-07-11 11:45:59 +02:00
Laurent Destailleur
7ee1388582
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-07-04 12:22:10 +02:00
Laurent Destailleur
c1d33af50d
- Fix: [ bug #1517 ] Packages sizes.
2014-07-02 20:11:08 +02:00
Laurent Destailleur
ea310efba5
Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE
...
trigger
2014-07-02 19:57:18 +02:00
Laurent Destailleur
57b546650a
Fix: Hide title of event when agenda module disabled.
2014-06-30 19:03:52 +02:00
Laurent Destailleur
71ee974ddb
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750
Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to
...
sender.
2014-06-28 14:48:00 +02:00
Laurent Destailleur
fc4493242a
Merge pull request #1685 from KreizIT/3.6
...
FIX : #1477 , #1478 , #1479
2014-06-26 21:00:26 +02:00
Laurent Destailleur
018e1d31e3
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/class/product.class.php
htdocs/projet/class/project.class.php
2014-06-25 20:22:25 +02:00
Cedric
ee91f4a3f7
FIX : #1477 , #1478 , #1479
2014-06-25 13:37:55 +02:00
Cedric
e21e4dbf11
- FIX #1482 #1484 #1486
...
- Add missing triggers in interface_90
2014-06-24 11:49:53 +02:00
Cedric
00779dd8fa
FIX #1460 , #1461
2014-06-24 10:53:18 +02:00
Laurent Destailleur
04ead87aea
Merge pull request #1681 from KreizIT/FIX1485
...
FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
2014-06-23 20:20:31 +02:00
Cedric
7ced580abc
Add fix to changelog
2014-06-23 12:35:37 +02:00
Laurent Destailleur
b4add020a9
Fix: Question about warehouse must not be done when module stock is
...
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
2014-06-23 11:47:07 +02:00
Laurent Destailleur
d19b34cc7e
Fix: Renaming a project with uplaoded files failed.
2014-06-21 15:45:53 +02:00
Laurent Destailleur
76532218c2
Fix: [ bug #1476 ] Invoice creation form loses invoice date when there
...
is a validation error
2014-06-21 15:35:30 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Laurent Destailleur
28fd8c6862
Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top
...
margin.
2014-06-20 14:04:37 +02:00
Laurent Destailleur
a2065d0b6a
Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a
...
supplier order.
2014-06-20 13:49:59 +02:00
Laurent Destailleur
fcb00b2024
Fix: [ bug #1425 ]
2014-06-20 13:38:44 +02:00
Laurent Destailleur
f7654107f9
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object
...
Fix 1455 outstanding amount
2014-06-20 13:22:08 +02:00
Laurent Destailleur
c903fe9340
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2014-06-20 13:20:07 +02:00
Laurent Destailleur
1cffc8d8f6
Merge branch '3.5' of github.com:fappels/dolibarr into fappels-3.5
2014-06-20 13:18:28 +02:00
Laurent Destailleur
6740e0321a
Merge pull request #1670 from FHenry/3.5
...
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
2014-06-20 13:16:11 +02:00
Laurent Destailleur
8ce8bf47ee
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
Conflicts:
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
2014-06-20 12:48:08 +02:00
Florian HENRY
40f5911f52
Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a
...
product (on supplier order part)
2014-06-20 09:36:31 +02:00
Francis Appels
5b5473bc7c
Fix: [ bug #1509 ] Expedition admin submit error
...
Expedition admin free text & watermark submit error
2014-06-19 10:02:58 +02:00
Florian HENRY
0645189432
If multiprice level is used the VAT on addline is not correct
2014-06-18 10:56:38 +02:00
Florian HENRY
7f92031583
Changelog
2014-06-17 11:31:20 +02:00
Florian HENRY
0f77fbaea2
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
...
card
2014-06-17 11:18:30 +02:00
Laurent Destailleur
0c5c1cf849
Merge branch '3.5' of github.com:FHenry/dolibarr into 3.5
...
Conflicts:
ChangeLog
2014-06-14 13:21:32 +02:00
Laurent Destailleur
0453daae72
Merge pull request #1656 from netfab/3.5
...
html fix : missing </tr>.
2014-06-14 12:34:06 +02:00
Laurent Destailleur
710497a081
Merge branch 'bug-1451' of github.com:marcosgdf/dolibarr into 3.5
...
Conflicts:
ChangeLog
2014-06-14 12:32:59 +02:00
Laurent Destailleur
cf948065f4
Fixes for bug 1449, 1450 and 1451 #1654
2014-06-14 12:30:48 +02:00
Laurent Destailleur
c67dad0240
Merge branch 'bug-1432' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1432
Conflicts:
ChangeLog
2014-06-14 12:27:47 +02:00
Florian HENRY
0916d2cf3b
Fix link element from project "associates object" pages
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
2014-06-13 15:54:37 +02:00
Florian HENRY
f796a6408e
Do not display dictionnay for non activated module
2014-06-12 15:28:11 +02:00
Florian HENRY
80facefa23
Fix [ bug #1454 ] Mention de bas de page erroné
2014-06-12 09:13:51 +02:00
Laurent Destailleur
40742e84a9
Fix: Bad balance of colspan.
...
Fix: Filter on status was not visible when selected from url.
Fix: Filtering on status was last when asking to sort.
2014-06-11 16:47:00 +02:00
Fab
2fed26d68b
html fix : missing </tr>.
2014-06-11 08:01:05 +02:00
Marcos García de La Fuente
ff37adf6f1
Fix: [ bug #1451 ] Interrupted order clone through trigger, loads nonexistent order
2014-06-10 13:47:30 +02:00
Marcos García de La Fuente
7cb5cc550f
Didn't mean to change this entry of the changelog
2014-06-10 13:41:17 +02:00
Marcos García de La Fuente
b9801a8b3c
Missing changelog
2014-06-10 13:32:47 +02:00
Marcos García de La Fuente
900b182f3c
Updated changelog
2014-06-10 12:22:31 +02:00
Marcos García de La Fuente
0c1ba58a00
Fix: [ bug #1449 ] Trigger ORDER_CREATE ignores interception on error
2014-06-10 12:13:27 +02:00
Marcos García de La Fuente
e7cfb719b9
[ bug #1432 ] Trigger SHIPPING_CREATE ignores interception on error
2014-06-10 12:05:31 +02:00
Laurent Destailleur
47c982c506
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2014-06-10 08:45:08 +02:00
Laurent Destailleur
41adaeea99
Merge branch 'bug-1443' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1443
Conflicts:
ChangeLog
2014-06-10 01:42:39 +02:00
Laurent Destailleur
5853b9eb30
Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1416
Conflicts:
ChangeLog
2014-06-10 01:37:43 +02:00
Laurent Destailleur
9e91225936
Merge pull request #1648 from marcosgdf/bug-1415
...
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
2014-06-10 01:28:56 +02:00
Marcos García de La Fuente
85d906078a
Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or limit date for payment
2014-06-09 23:50:57 +02:00
Marcos García de La Fuente
0b73b44f34
Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the supplier order card
2014-06-09 23:38:06 +02:00
Marcos García de La Fuente
83b58aca89
Typo
2014-06-09 22:49:27 +02:00
Marcos García de La Fuente
0810e6756a
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
2014-06-09 22:48:16 +02:00
Laurent Destailleur
171227e43a
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2014-06-06 12:00:21 +02:00
Marcos García de La Fuente
4c11e37203
Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text
2014-06-03 15:45:03 +02:00
Laurent Destailleur
fc2bd4ab4e
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
...
report
(cherry picked from commit bd061f4 )
2014-06-02 02:16:49 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
a63d085181
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-05-23 20:22:40 +02:00
Laurent Destailleur
07bc933110
Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1405
Conflicts:
ChangeLog
2014-05-23 20:21:41 +02:00
Laurent Destailleur
649fdd72dc
Merge pull request #1622 from marcosgdf/bug-1410
...
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
2014-05-23 20:20:22 +02:00
Laurent Destailleur
2771c506e9
Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1407
Conflicts:
ChangeLog
2014-05-23 20:17:41 +02:00
Laurent Destailleur
d1ee20dd42
Merge branch 'bug-1411' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1411
Conflicts:
ChangeLog
2014-05-23 20:11:13 +02:00
Laurent Destailleur
dc94b6e1bf
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-05-23 20:08:43 +02:00
Laurent Destailleur
9c398b14c5
Merge branch 'bug-1397' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1397
Conflicts:
ChangeLog
2014-05-23 20:06:40 +02:00
Marcos García de La Fuente
fa733c8ba4
Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande
2014-05-23 11:42:14 +02:00
Laurent Destailleur
2c05146778
Merge pull request #1621 from marcosgdf/bug-1388
...
Fix: [ bug #1388 ] Wrong date when invoicing several orders
2014-05-23 11:34:41 +02:00
Marcos García de La Fuente
a705d4e333
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
2014-05-23 03:00:46 +02:00
Marcos García de La Fuente
0d121de1a6
Fix: [ bug #1388 ] Wrong date when invoicing several orders
2014-05-23 02:48:24 +02:00
Marcos García de La Fuente
77c09d887a
Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes
2014-05-23 02:44:02 +02:00
Marcos García de La Fuente
b2f299f5e4
Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled
2014-05-23 02:22:38 +02:00
Marcos García de La Fuente
603c28dcdd
[ bug #1397 ] Filter by supplier orders with status Draft does not filter
2014-05-23 02:04:02 +02:00
Florian HENRY
2a16a562d9
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2014-05-22 12:51:55 +02:00
Florian HENRY
87b9d0412c
Fix element page on project
2014-05-22 12:51:00 +02:00
Laurent Destailleur
94335b186e
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Laurent Destailleur
c82ff0a146
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2014-05-21 19:51:05 +02:00
Laurent Destailleur
4a89446162
Fix: When number reach 9999 with default numbering module, next number
...
will be 10000 instead of 0000 and error.
2014-05-21 19:47:41 +02:00
Florian HENRY
5a5c858578
[ bug #1399 ] [pgsql] Silent warning when setting a propal as
...
"facturée" in propal.php
2014-05-19 16:21:59 +02:00
Laurent Destailleur
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Marcos García de La Fuente
39b0ed7fc2
Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice.
2014-05-14 22:47:19 +02:00
Laurent Destailleur
bd061f4245
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
...
report
2014-05-13 01:29:01 +02:00
Laurent Destailleur
5f0c4dbe48
Fix: TCPDF error file not found in member card generation
2014-05-12 10:07:57 +02:00
Laurent Destailleur
6f4a390780
Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error
2014-05-11 19:06:17 +02:00
Laurent Destailleur
bcfc9f8aa1
Fix: [ bug #1381 ] PHP Warning when listing stock transactions page
2014-05-11 18:06:30 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
Laurent Destailleur
7bb24969d8
Fix: [ bug #1372 ] Margin calculation does not work in proposals
2014-05-10 19:52:24 +02:00
Laurent Destailleur
4e41b721fb
Fix: Nb of notes and doc not visible onto tasks.
2014-05-10 16:43:47 +02:00
Laurent Destailleur
d76683a116
New: Add hooks on project card page.
2014-05-08 20:07:16 +02:00
Laurent Destailleur
7bfbc4cbf3
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/modExpedition.class.php
htdocs/projet/class/project.class.php
2014-05-07 19:30:19 +02:00
Laurent Destailleur
40577ab445
New: Can enter holiday for someone else if user has permission for.
2014-05-07 15:03:05 +02:00
Marcos García de La Fuente
fb7f08b33a
Corrected changelog message
2014-05-07 10:43:19 +02:00
Marcos García de La Fuente
7fe5389adf
Updated changelog
2014-05-07 10:41:43 +02:00
Laurent Destailleur
a127f09377
- New: Paypal/paybox email sent after backcall of a payment is now a
...
formated and translated HTML content. For member subscription
renewal, there is also a link to member.
- New: When a subscription is recorded with invoice and payment: the
document (PDF) of invoice is also generated and the invoice is set
to status paid.
2014-05-07 10:33:10 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
fe43d10c79
Fix: [ bug #1360 ] note indicator for member tab.
2014-05-06 23:42:19 +02:00
Laurent Destailleur
5a6ad1ef5f
Fix: [ bug #1362 ] Note is not saved
...
Fix: tr/td balance.
2014-05-06 23:19:48 +02:00
Laurent Destailleur
460b5296ba
Fix: [ bug #1353 ] Email notifications, wrong URL
2014-05-06 22:21:34 +02:00
Laurent Destailleur
215ff25ddd
Fix: navigation on tab notes for shipment was not working.
2014-05-06 13:51:22 +02:00
Laurent Destailleur
4da918ce01
Update doc
2014-05-06 13:32:37 +02:00
Juanjo Menent
a4f1c7eb50
Fix: Suppliers invoice mask fails using {tttt} in numbering
...
Conflicts:
ChangeLog
2014-05-06 10:04:02 +02:00
Juanjo Menent
011fe254a6
Fix: Suppliers invoice mask fails using {tttt} in numbering
2014-05-06 09:59:10 +02:00
Laurent Destailleur
63100c9c06
Properties "civilite_id" were renamed into "civility_id".
2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51
New: The combo list of juridical status is now sorted
2014-05-04 23:46:36 +02:00
Laurent Destailleur
2bba72640b
Merge branch 'composer' of github.com:GPCsolutions/dolibarr into
...
GPCsolutions-composer
Conflicts:
composer.json
2014-05-04 21:15:41 +02:00
Laurent Destailleur
c9ebe7729f
Merge branch 'bug-1371' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1371
Conflicts:
ChangeLog
2014-05-04 17:56:24 +02:00
Laurent Destailleur
697f68c9a9
Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5
...
Conflicts:
ChangeLog
2014-05-04 17:43:47 +02:00
Laurent Destailleur
03f9f0bada
Fix: Pb of records not correctly cleaned when module marge is
...
uninstalled (conflict between 'margin' and 'margins').
2014-05-03 20:21:35 +02:00
Laurent Destailleur
f34a9983bd
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
...
Fix: Can disable features with CKEDITOR.
2014-05-03 02:22:37 +02:00
Marcos García de La Fuente
4599b22cb5
Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents
2014-05-02 17:15:56 +02:00
Florian HENRY
a4126fae66
[ bug #1341 ] Lastname not added by file or direct input in mass
...
e-mailing
2014-05-01 18:13:01 +02:00
Laurent Destailleur
6a200105b9
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
ChangeLog
2014-05-01 11:16:42 +02:00
aspangaro
d1392f7a5f
Changelog
2014-04-30 06:58:14 +02:00
Florian HENRY
91505fdebe
changelog
2014-04-28 17:24:14 +02:00
Florian HENRY
79fabb05b5
changelog
2014-04-28 17:23:13 +02:00
Florian HENRY
7a46bdfc55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-04-28 17:20:40 +02:00
Florian HENRY
dddbc37d35
Enable option clone target emailing
2014-04-28 17:18:11 +02:00
Laurent Destailleur
4a23a8a789
Merge branch 'category_translate' of github.com:aternatik/dolibarr into
...
aternatik-category_translate
Conflicts:
ChangeLog
2014-04-28 02:39:56 +02:00
Laurent Destailleur
ac07dd5a8c
Update doc
2014-04-28 02:38:33 +02:00
Laurent Destailleur
e5c5b15ecc
Qual: Start to clean module ECM (Code is to complex). Prepare for
...
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
2014-04-28 01:46:11 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
bd8cdd337a
Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
2014-04-26 22:17:11 +02:00
Laurent Destailleur
950c59eb61
Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers.
2014-04-26 17:34:39 +02:00
Laurent Destailleur
6968304641
Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
2014-04-26 17:27:59 +02:00
Laurent Destailleur
c54d9d9171
Fix: [ bug #1351 ] VIES verification link broken
2014-04-26 16:27:06 +02:00
jfefe
6b1a57d1b7
Update changelog
2014-04-25 16:13:58 +02:00
Laurent Destailleur
298da30200
New: Extrafields can be used as substitution key %EXTRA_XXX% into emails
...
texts for members.
2014-04-25 14:39:34 +02:00
Laurent Destailleur
01655d1757
New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send
...
invoice
by email whatever is its status.
2014-04-23 13:14:55 +02:00
Juanjo Menent
d527c4cf73
Fix: Price min of composition is not supplier price min by quantity
2014-04-22 09:57:43 +02:00
Laurent Destailleur
1c21dbc9e7
Merge pull request #1533 from FHenry/develop
...
Add filter date and total line on bank writing list page
2014-04-19 23:58:48 +02:00
Laurent Destailleur
bb2c829997
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
2014-04-18 12:34:32 +02:00
Laurent Destailleur
2213128531
Fix: invert label for accountancy_code_sell
2014-04-18 12:08:12 +02:00
Laurent Destailleur
ce34c01b9e
New: On page to enter supplier prices, if there is no supplier, add
...
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
2014-04-16 00:06:16 +02:00
Florian Henry
57e4453ea2
Add filter date and total line on bank writing list page
2014-04-13 18:26:21 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Juanjo Menent
f458c384d7
Fix: Can not make withdrawals
...
Conflicts:
ChangeLog
2014-04-11 12:10:04 +02:00
Juanjo Menent
75e76dc232
Fix: Can not make withdrawals
2014-04-11 12:07:01 +02:00
Laurent Destailleur
60b37dffe1
Fix: [ bug #1323 ] generation of odt files for tasks.
2014-04-09 00:07:32 +02:00
Laurent Destailleur
174d4f6ff2
Prepare 3.5.2
2014-04-05 16:15:04 +02:00
Laurent Destailleur
9a8a306d78
Qual: Method form->select_currency() has been removed. Use instead
...
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64
New: Can filter on status for supplier order.
2014-04-02 12:48:34 +02:00