Laurent Destailleur
0abeea059e
Uniformize and clean boxes behaviour and translation.
2014-10-27 21:48:28 +01:00
Laurent Destailleur
2b08417b77
Fix: [ bug #1612 ] Adding free product line line with negative qty in
...
credit notes, doesn't give error message
2014-10-27 01:51:33 +01:00
Laurent Destailleur
9619c0cdea
Fix: [ bug #1581 ] SQL injection possbile
2014-10-27 00:58:56 +01:00
Frédéric FRANCE
64a5a260dd
Update admin.lang
2014-10-25 11:54:38 +02:00
Laurent Destailleur
a1a03a8061
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 01:20:59 +02:00
Laurent Destailleur
0fc1c85b34
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 00:42:52 +02:00
Frédéric FRANCE
ccbaba79fb
Update deliveries.lang
2014-10-23 18:42:02 +02:00
Frédéric FRANCE
48a9be28a1
Update deliveries.lang
2014-10-23 18:39:12 +02:00
Laurent Destailleur
d396c62499
Fix: alignement
2014-10-22 23:49:52 +02:00
Laurent Destailleur
9278d21048
Add missing translation
2014-10-20 13:25:30 +02:00
Laurent Destailleur
0fba70d4d1
Fix: Triggers sending email for intervention and classify billed
2014-10-20 11:35:34 +02:00
Grégory DAVID
a794180586
Document the ability to export agenda calendar restricted to project ID
2014-10-18 16:41:47 +02:00
Laurent Destailleur
e53c328767
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
ChangeLog
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-10-18 15:45:44 +02:00
aspangaro
9f6a460d42
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
...
Resolve conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-10-18 15:32:50 +02:00
Laurent Destailleur
6a9d825a65
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-18 14:57:49 +02:00
Laurent Destailleur
85ce8f8fef
Merge pull request #1959 from aspangaro/develop-usercolor
...
Add field to select color of the user in user's card
2014-10-18 14:57:19 +02:00
Laurent Destailleur
90d47cffae
Better error management and better error message for reporting upload or
...
error of images.
2014-10-18 14:56:06 +02:00
Laurent Destailleur
5513a44a07
Fix: translation. Use "template" instead of "pre-defined"
2014-10-17 14:17:52 +02:00
Laurent Destailleur
78d289110d
Trans: Same verb
2014-10-17 13:07:23 +02:00
aspangaro
c1d016a531
Add field to select color of the user in user's card
2014-10-16 06:20:54 +02:00
Laurent Destailleur
38e4100e47
Better translation: Virtual product is a "package product".
2014-10-15 18:21:18 +02:00
aspangaro
861583bb77
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
2014-10-14 06:12:46 +02:00
Laurent Destailleur
f498921715
Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
...
GPCsolutions-droposcommerce
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/vi_VN/admin.lang
htdocs/langs/vi_VN/shop.lang
2014-10-13 00:50:51 +02:00
aspangaro
dad9a54959
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
2014-10-12 15:47:29 +02:00
aspangaro
71dafac03c
Add favorite button into country dictionary to put value on top select list
2014-10-12 15:28:01 +02:00
Laurent Destailleur
f08759a17e
Fix: area to generate doc must use half size not onethird.
...
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
2014-10-12 11:59:52 +02:00
Laurent Destailleur
2b479aa0b4
Qual: Uniformize translated label of progress on all pages.
...
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
2014-10-12 01:04:34 +02:00
Laurent Destailleur
60a6e2a579
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-09 17:06:13 +02:00
Laurent Destailleur
06cc08026b
Some fix on per user view.
2014-10-09 17:05:57 +02:00
Laurent Destailleur
f9377a4715
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-08 20:57:11 +02:00
Laurent Destailleur
2bbede6465
New: Can add product into category from category card.
2014-10-07 21:39:10 +02:00
aspangaro
7fa2b6b3eb
Update
2014-10-06 05:34:45 +02:00
aspangaro
7e11fa06bb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-05 16:35:38 +02:00
Laurent Destailleur
968b021985
Fix trad and sql error
2014-10-05 05:37:01 +02:00
Laurent Destailleur
81c28f528d
Fix translation
2014-10-05 05:13:09 +02:00
Laurent Destailleur
c51b964b19
Fix: Pb when showing availability
2014-10-05 03:44:20 +02:00
aspangaro
c1db82a791
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-04 08:10:12 +02:00
Laurent Destailleur
e70aebf2c7
Merge pull request #1937 from fappels/develop
...
Expedition lines from same orderline merged.
2014-10-04 00:58:19 +02:00
Laurent Destailleur
d9f898ab8c
Merge pull request #1916 from FHenry/develop
...
Add feature to order to invoice on supplier part
2014-10-04 00:31:11 +02:00
Francis Appels
840a98d8ac
Expedition lines from same orderline merged.
...
When there are more expedition lines from same orderline key, merge them
and get source warehouses. Usefull future possibility for creating
shippinglines with same products from multiple warehouses.
@KreizIT also changed some batch related items.
2014-10-03 12:20:02 +02:00
Laurent Destailleur
166853dd56
Fix: miscellaneous bugs
2014-10-03 12:15:21 +02:00
Laurent Destailleur
494e6786b3
Fix: Translation
2014-10-03 03:52:50 +02:00
aspangaro
dca4591cdf
Add calculator
2014-10-02 20:00:35 +02:00
aspangaro
3627f157d2
Add langs & debug
2014-10-01 07:16:29 +02:00
BadPixxel
cf2ba78fc1
Missing Key for getNomUrl function
2014-09-30 19:11:01 +02:00
Laurent Destailleur
e35135d5b1
Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into
...
develop
Conflicts:
htdocs/compta/ventilation/card.php
htdocs/compta/ventilation/fournisseur/card.php
htdocs/compta/ventilation/fournisseur/list.php
htdocs/compta/ventilation/list.php
htdocs/core/menus/init_menu_auguria.sql
2014-09-29 16:31:35 +02:00
Florian HENRY
46f673fb5f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fourn/card.php
2014-09-29 16:01:49 +02:00
Raphaël Doursenaud
f01e76f686
Removed unmaintaned OScommerce module
2014-09-29 15:22:48 +02:00
Laurent Destailleur
8ccb581185
Fix: Change for php 5.6
...
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
2014-09-29 13:21:03 +02:00
Florian HENRY
ce145cc056
Add cache excel export on harddrive with
...
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
2014-09-29 10:16:48 +02:00
