fappels
|
e9be3d19f4
|
Fix migration - remove default for text field
remove default for user_param value text field
lang typo
|
2015-11-16 21:24:08 +01:00 |
|
Alexis Algoud
|
55b23c4918
|
FIX add billed field in supplier order
|
2015-11-16 14:55:46 +01:00 |
|
Laurent Destailleur
|
dfc01e971f
|
Update files for transifex sync
|
2015-11-15 20:27:43 +01:00 |
|
Laurent Destailleur
|
6bd6be0912
|
Debug and rename experimental module "supplier proposal". Still work to
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
|
2015-11-15 19:23:39 +01:00 |
|
Laurent Destailleur
|
db941d5395
|
NEW Enhance style engine. Add option to set color of links
|
2015-11-15 11:31:09 +01:00 |
|
Laurent Destailleur
|
192fdbdcc4
|
Minor look uniformization
|
2015-11-14 23:10:12 +01:00 |
|
aspangaro
|
0f75d76296
|
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
|
2015-11-13 07:52:44 +01:00 |
|
Laurent Destailleur
|
471bcdd29f
|
Remove hard coded list of permissions.
|
2015-11-13 02:21:27 +01:00 |
|
aspangaro
|
30c4f1c896
|
HRM : language
|
2015-11-12 07:40:46 +01:00 |
|
aspangaro
|
7693b407e8
|
HRM: Begin to work on employee card
|
2015-11-12 06:59:40 +01:00 |
|
aspangaro
|
4ce6287d52
|
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
|
2015-11-12 05:51:12 +01:00 |
|
aspangaro
|
f602e1fba7
|
HRM : Add an email address in admin to prevent HRM external service (public accountant for exemple)
|
2015-11-12 05:48:56 +01:00 |
|
Laurent Destailleur
|
2bd0f04d8f
|
Add feature to get nb of top menu entrie
Fix translation of units
|
2015-11-12 00:48:37 +01:00 |
|
frederic34
|
cd738ef483
|
Merge remote branch 'upstream/develop' into fccard
Conflicts:
htdocs/commande/card.php
|
2015-11-11 17:23:37 +01:00 |
|
frederic34
|
b8a84d68ec
|
add messages
|
2015-11-09 18:19:10 +01:00 |
|
Laurent Destailleur
|
096ec3100d
|
Merge pull request #3926 from frederic34/fccard
allow chaining and remove header exit
|
2015-11-08 15:49:33 +01:00 |
|
Laurent Destailleur
|
350ef610e9
|
Fix beluga pdf for projects. Add missing expense reports.
|
2015-11-07 12:36:34 +01:00 |
|
frederic34
|
7349862b64
|
translations
|
2015-11-07 11:19:31 +01:00 |
|
Laurent Destailleur
|
f9d0c887ae
|
NEW Add a refresh button on page list of direct print jobs.
|
2015-11-06 02:20:42 +01:00 |
|
Laurent Destailleur
|
2dc644da30
|
Debug Direct print module using the OAuth setup.
|
2015-11-06 01:33:49 +01:00 |
|
Alexis Algoud
|
8221817087
|
NEW add an option to use standard ISO location for bill in crabe model
For electronic sending solutions, it could be required
|
2015-11-05 16:17:09 +01:00 |
|
philippe grand
|
b9c0cd316f
|
[Qual] Fix : TODO:translate
|
2015-11-05 11:11:51 +01:00 |
|
Laurent Destailleur
|
41ccfc411a
|
Better error message
|
2015-11-05 10:11:39 +01:00 |
|
Laurent Destailleur
|
1f4481a6b0
|
Merge pull request #3172 from atm-maxime/new_creditnote
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
|
2015-11-05 02:45:15 +01:00 |
|
Laurent Destailleur
|
11b7d8a44c
|
Merge pull request #3873 from frederic34/escpos
Escpos Receipt printer
|
2015-11-05 02:18:09 +01:00 |
|
Laurent Destailleur
|
e26940ddf7
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
|
2015-11-05 01:50:30 +01:00 |
|
frederic34
|
644a104d5f
|
start to parse template
|
2015-11-04 23:14:50 +01:00 |
|
frederic34
|
d362d889f6
|
wip
|
2015-11-03 20:50:01 +01:00 |
|
Laurent Destailleur
|
cd68ea9d0f
|
Fix: We must use external URL for OAuth.
|
2015-11-02 21:42:11 +01:00 |
|
Laurent Destailleur
|
ffe1284a85
|
Merge pull request #3840 from frederic34/printgcp
Printing with Google Cloud Print
|
2015-11-02 20:09:13 +01:00 |
|
Laurent Destailleur
|
da0aa2f937
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
|
2015-11-02 19:31:42 +01:00 |
|
Laurent Destailleur
|
055fe5e275
|
FIX #3786 Translation of select box.
|
2015-11-02 19:17:22 +01:00 |
|
Laurent Destailleur
|
bb26e1c195
|
Merge pull request #3860 from frederic34/patch-5
Update resource.lang
|
2015-11-02 18:06:31 +01:00 |
|
Frédéric FRANCE
|
76c89884ba
|
Update resource.lang
|
2015-11-02 17:32:02 +01:00 |
|
Frédéric FRANCE
|
ebf6493987
|
Typo
|
2015-11-02 17:31:03 +01:00 |
|
Laurent Destailleur
|
c119859696
|
NEW The quick search box on left menu can also search into expense
reports.
|
2015-11-02 13:14:46 +01:00 |
|
frederic34
|
9149032a03
|
Merge remote branch 'upstream/develop' into printgcp
Conflicts:
htdocs/core/actions_printing.inc.php
|
2015-11-02 11:43:34 +01:00 |
|
Laurent Destailleur
|
1a0179dd1f
|
More complete help
|
2015-11-02 11:08:36 +01:00 |
|
Laurent Destailleur
|
200e4638f4
|
Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
Fix: #2591 Margin is incorrect used with POS
|
2015-11-02 11:06:20 +01:00 |
|
Laurent Destailleur
|
a161e6d47a
|
Continue debug of PRODUIT_MULTIPRICES option.
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
|
2015-11-02 10:09:09 +01:00 |
|
frederic34
|
bb06a55844
|
Work on list jobs
|
2015-10-31 23:27:10 +01:00 |
|
Juanjo Menent
|
a58b5f26f6
|
Merge pull request #3774 from marcosgdf/multiprice-generator
NEW Level multiprice generator based on per cent variations over base price
|
2015-10-31 23:03:19 +01:00 |
|
frederic34
|
22d1cf860c
|
Add translation
|
2015-10-31 22:09:50 +01:00 |
|
frederic34
|
df3af6979e
|
Translation in paypal lib
|
2015-10-31 21:43:59 +01:00 |
|
Marcos García de La Fuente
|
e1f2efee4d
|
Merge branch 'develop' into multiprice-generator
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
|
2015-10-31 11:46:14 +01:00 |
|
frederic34
|
b6be372c4b
|
Merge remote branch 'upstream/develop' into printgcp
|
2015-10-30 18:12:34 +01:00 |
|
frederic34
|
1694c690ed
|
Printing with Google Cloud Print
|
2015-10-30 17:22:06 +01:00 |
|
Laurent Destailleur
|
6cc3df7e71
|
NEW Quick searh filter works on invoice, proposal, order, intervention,
contract
|
2015-10-30 08:35:56 +01:00 |
|
Juanjo Menent
|
de6bef82dd
|
Merge pull request #3820 from grandoc/develop
[Qual] Uniformize code
|
2015-10-29 10:54:36 +01:00 |
|
aspangaro
|
4e9d06785c
|
Fix #3818 & presentation
|
2015-10-29 06:47:42 +01:00 |
|