Regis Houssin
8daef9d99f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-10-12 11:58:57 +02:00
Regis Houssin
bc0f65b73c
Fix: reorder lines problem
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2013-10-12 11:58:38 +02:00
Laurent Destailleur
5ee05836b6
Missing translation languages
2013-10-11 10:06:30 +02:00
Laurent Destailleur
b0e38f7619
Fix: Manage strange language code reported bu chrome browsers.
2013-10-11 10:01:47 +02:00
Laurent Destailleur
ef4970476a
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/product/stock/mouvement.php
2013-10-10 22:59:22 +02:00
Laurent Destailleur
053d5eeff7
Set name of vat number for some countries according to
...
http://en.wikipedia.org/wiki/VAT_identification_number
2013-10-10 22:50:22 +02:00
Laurent Destailleur
d12240e087
Add doc
2013-10-10 22:37:07 +02:00
Laurent Destailleur
303cad162b
Qual: Show the rule name used to make calculation and link to change
...
rule.
2013-10-10 19:33:49 +02:00
Laurent Destailleur
e12d31766a
Fix: Hide a report at wrong place and add a comment to explain where to
...
put it and to fix the calculation method.
2013-10-10 17:34:26 +02:00
Laurent Destailleur
383ead9234
Fix: remove a test output
2013-10-10 17:30:28 +02:00
Laurent Destailleur
ae8f0c3efd
New: Add number of product in stock before and after selected period
...
when a filter is done on a period + a specific product.
2013-10-10 17:16:15 +02:00
Laurent Destailleur
f225b35a90
Fix: filter on warehouse
...
Conflicts:
htdocs/product/stock/mouvement.php
2013-10-10 15:51:59 +02:00
Laurent Destailleur
22fd5dfb8a
Fix: Error when no id provided
2013-10-10 15:49:41 +02:00
Laurent Destailleur
bb492d6d1f
Fix: filter on warehouse
2013-10-10 15:45:03 +02:00
Laurent Destailleur
3e91a4d982
Fix translation for paraguay
2013-10-09 21:43:31 +02:00
Laurent Destailleur
8aff0e2e1e
Trans: Add language file for paraguay.
2013-10-09 21:31:17 +02:00
Laurent Destailleur
0f343d3f8a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/en_US/stocks.lang
htdocs/langs/fr_FR/stocks.lang
2013-10-09 21:10:31 +02:00
Laurent Destailleur
a11a0d6491
Fix: debug replanishment feature
2013-10-09 21:09:15 +02:00
Laurent Destailleur
864315d018
Fix: debug replanishment feature
2013-10-09 21:07:00 +02:00
Laurent Destailleur
41bf4d53a8
Fix: filter on warehouse
...
Conflicts:
htdocs/product/stock/mouvement.php
2013-10-09 20:44:42 +02:00
Laurent Destailleur
661faa63dd
Fix: filter on warehouse
2013-10-09 20:42:46 +02:00
Laurent Destailleur
f4a83f0851
Qual: Debug of replenishment feature
2013-10-09 20:30:49 +02:00
Laurent Destailleur
43fd4d0784
Complete debian packager tuto
2013-10-09 16:04:06 +02:00
Laurent Destailleur
d2c4de9232
Fix: translation
2013-10-09 15:00:42 +02:00
Laurent Destailleur
603c2aa938
Qual: Removed not used file
2013-10-08 21:35:44 +02:00
Laurent Destailleur
e343d3bc6f
Fix: missing property
2013-10-08 21:16:53 +02:00
Laurent Destailleur
894f46cd10
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-10-08 21:15:20 +02:00
Laurent Destailleur
eb10b2c5e9
Fix: missing property
2013-10-08 21:14:54 +02:00
Laurent Destailleur
87ca1d2e2e
Fix: translation
2013-10-08 15:18:00 +02:00
Laurent Destailleur
3f8738ad2b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-10-08 15:16:36 +02:00
Laurent Destailleur
4dc1708f26
Merge pull request #1251 from atm-maxime/develop
...
Add multilang management in ODT models
2013-10-08 05:48:29 -07:00
Laurent Destailleur
ef86f150be
Fix: duplicate field
2013-10-08 12:25:41 +02:00
Regis Houssin
7d87287da9
Fix: CRLF
2013-10-08 09:18:58 +02:00
Maxime Kohlhaas
845deb9a63
Add multilang management in ODT models
2013-10-08 09:17:04 +02:00
Laurent Destailleur
8d63c2f9c5
Fix: ref_ext was not loaded
...
Conflicts:
htdocs/contact/class/contact.class.php
2013-10-08 00:44:55 +02:00
Laurent Destailleur
a690ae05f6
Fix: ref_ext was not loaded
2013-10-08 00:42:40 +02:00
Laurent Destailleur
4958d17d24
Doxygen
2013-10-08 00:42:28 +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
b778700c95
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contact/fiche.php
2013-10-07 22:52:14 +02:00
Laurent Destailleur
c235c4e4ba
Fix: security sql injection
2013-10-07 22:50:27 +02:00
Laurent Destailleur
ebb1dbcec3
Fix: security sql injection
2013-10-07 22:50:12 +02:00
Laurent Destailleur
3f94af792b
Fix: security sql injection
2013-10-07 22:49:33 +02:00
Laurent Destailleur
47a9837046
Uniformize ref_customer into list
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
2013-10-07 21:58:12 +02:00
Laurent Destailleur
a99aa9acba
Merge remote-tracking branch 'origin/3.4' into develop
2013-10-07 21:49:57 +02:00
Laurent Destailleur
c35135b62b
Fix: use css3
2013-10-07 16:59:38 +02:00
Laurent Destailleur
123beb1e34
Fix: Bad property
2013-10-07 16:58:07 +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
Laurent Destailleur
51dd5cf259
Merge pull request #1250 from altairis-fr/margin1
...
fix bugs on margin calculation and margin reports
2013-10-05 07:42:13 -07:00
Christophe Battarel
02278a399c
better margin calculation (especially for credit notes)
2013-10-05 10:29:22 +02:00
