Laurent Destailleur
c324f6a9a3
Merge pull request #1295 from FHenry/develop
...
Display customer code (according setting) into list
2013-11-15 05:05:36 -08:00
Laurent Destailleur
8b60c79033
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-14 17:17:19 +01:00
Laurent Destailleur
b911d30684
Fix: Stock into subproduct was wrong
...
New: Show best sell price and total for virtual products
2013-11-14 17:16:17 +01:00
simnandez
b9c8852471
Qual: Improve suppliers orders manual receivings
2013-11-14 17:08:59 +01:00
Christophe Battarel
7dbe2bcf2c
fix wrong buy price update
2013-11-13 18:41:31 +01:00
Florian Henry
0065adc298
Wrong call of show_contact into fourn/fiche.php
2013-11-13 16:37:17 +01:00
Laurent Destailleur
b2308ba65c
Merge pull request #1284 from GPCsolutions/links
...
Links
2013-11-06 17:15:49 -08:00
Laurent Destailleur
4c4064d7b9
Enable option to swith vat calculation mode
2013-11-06 17:45:55 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1
factorization
2013-11-06 10:20:54 +01:00
Cédric Salvador
c96b2d3b87
factorized form attach, documents list and links list for the document pages
2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
c4a43890c4
Merge pull request #1282 from grandoc/develop
...
fix : language
2013-11-05 10:50:14 -08:00
Laurent Destailleur
2d7181553b
Fix: translation
2013-11-05 15:29:58 +01:00
Grand Philippe
a14de0c035
fix : language
2013-11-05 15:29:33 +01:00
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01:00
Laurent Destailleur
70342c09b8
Fix: Better management of using ajax for upload form (to solve problem
...
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
2013-10-29 17:52:13 +01:00
Laurent Destailleur
a8f784083c
Show ref with label on bank account.
2013-10-16 19:00:00 +02:00
Laurent Destailleur
94c376bf37
Fix: Edit payment date
2013-10-16 17:55:15 +02:00
Laurent Destailleur
91c6d47a60
Fix: Clean param
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2013-10-08 00:06:14 +02:00
Laurent Destailleur
51a82a2418
Fix: Clean param
2013-10-08 00:04:09 +02:00
Laurent Destailleur
141258f514
Merge remote-tracking branch 'origin/3.4' into develop
...
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT
Conflicts:
htdocs/fourn/product/liste.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2013-10-07 16:17:51 +02:00
Christophe Battarel
b7fe0cec34
fix bug on filter and sort
2013-09-26 19:05:56 +02:00
Laurent Destailleur
065c87d81c
Qual: uniformize code: property ->tel on objects is now ->phone
...
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
3d62303d59
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-19 01:02:53 +02:00
Laurent Destailleur
8526d34d3b
Fix: Calculation of second rounding method is available for supplier
...
invoices.
2013-09-18 16:46:54 +02:00
Laurent Destailleur
d3efd86e3d
Fix: Syntax error
2013-09-18 00:33:49 +02:00
Laurent Destailleur
e47165fa38
Merge pull request #1239 from csalvador/replenishment-fix
...
Replenishment fix
2013-09-16 10:39:35 -07:00
Cédric Salvador
967c20e3e9
Improved error message
2013-09-16 14:51:22 +02:00
Cédric Salvador
fc136d0d06
changed parameter
2013-09-16 14:17:53 +02:00
Cédric Salvador
b0e03462d3
fixed empty being used on a function
2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9
natural search in list pages
2013-09-16 14:17:53 +02:00
Laurent Destailleur
b20b82df3d
Fix: we must use conf-currency as parameter of method price instead of
...
using langs->getCurrencySymbol
2013-09-15 13:04:38 +02:00
Laurent Destailleur
c1b6e05cc0
Fix: bad sql syntax
2013-09-15 12:46:54 +02:00
Laurent Destailleur
5e969536c0
Fix: bad sql syntax
2013-09-15 12:34:22 +02:00
Christophe Battarel
d9d90f1088
Fix: Supplier price displayed on document lines didnt take discount
...
Conflicts:
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-15 12:04:46 +02:00
Christophe Battarel
6959ccf627
Fix: Supplier price displayed on document lines didnt take discount
2013-09-15 11:41:41 +02:00
Laurent Destailleur
f2bdd8c1d8
Work on alternative vat calculation mode
2013-09-13 17:43:26 +02:00
simnandez
b36dc08e00
Remove unnecessary code
2013-09-12 09:59:23 +02:00
simnandez
eb44f272e3
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-11 17:10:06 +02:00
simnandez
a0ce8974b5
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-11 16:44:34 +02:00
Laurent Destailleur
e467d63a94
Try to fix false positive
2013-09-10 15:45:36 +02:00
Laurent Destailleur
1b526b7aa5
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
.travis.yml
htdocs/fourn/facture/index.php
2013-09-09 20:00:12 +02:00
Laurent Destailleur
89619cad7b
Fix: Unit test regression
2013-09-08 23:38:40 +02:00
Laurent Destailleur
74a50d8d6c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-07 19:51:00 +02:00
Laurent Destailleur
bd24711b30
Fix: navigation of supplier invoices
2013-09-07 19:50:47 +02:00
Laurent Destailleur
1c62d2a475
Fix: Ref not visible into page
2013-09-07 19:11:54 +02:00
Laurent Destailleur
305c1d63a7
Qual: Uniformize code. No useless redirect. use GETPOST.
2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902
Qual: Replace deprecated call ->form_confirm with ->formconfirm
2013-09-06 11:51:24 +02:00
