lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,390 Commits 43 Branches 150 Tags 886 MiB
f34aadef3d
Commit Graph

1861 Commits

Author SHA1 Message Date
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Laurent Destailleur
4083d9a819 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-06 09:49:54 +02:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
d1d329a6a2 Fix: Navigation into supplier invoices 2013-05-29 21:20:04 +02:00
Laurent Destailleur
3fc8de8dde Fix: Navigation into supplier invoices 2013-05-29 15:56:18 +02:00
simnandez
05aa11fce0 [ bug #914 ] It is not possible to validate a supplier invoice 2013-05-28 09:29:11 +02:00
simnandez
0c62942f03 [ bug #914 ] It is not possible to validate a supplier invoice 2013-05-28 09:28:31 +02:00
Laurent Destailleur
b61ca887d5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/cache.manifest
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-05-27 12:57:57 +02:00
Laurent Destailleur
e3e00b034b Fix: Dir with linked files was not renamed when invoices was renamed 
with its final ref (linked files were lost)
Fix: Ref visible into message was wrong.
Fix: Bad counting of product/service available
 2013-05-25 20:43:01 +02:00
Laurent Destailleur
701d8485ef Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
Laurent Destailleur
eecfbf9670 Fix: Bad link if not supplier defined for product 2013-05-24 18:55:04 +02:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +02:00
Laurent Destailleur
b9f5c15542 Fix: Bad link if not supplier defined for product 2013-05-24 18:49:40 +02:00
Laurent Destailleur
92a7037c1d Fix: Missing translation 2013-05-24 18:20:28 +02:00
Laurent Destailleur
3b6c55f908 Fix: Param was renamed 2013-05-22 17:29:25 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
Laurent Destailleur
3a11e0baad New: Script export-bank-receipts should be ready for test. 2013-05-14 23:59:59 +02:00
fhenry
68259c51eb Fix [ bug #886 ] Silent pgsql errors in 
/fourn/commande/fiche.php?action=create
 2013-05-07 17:09:31 +02:00
fhenry
8d6f959d31 Fix [ bug #864 ] fournisseur_extrafields 2013-05-01 22:57:03 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +02:00
Laurent Destailleur
50dd0ef7ee Merge pull request #885 from FHenry/develop 
Review extrafield for compliance with wiki
 2013-04-26 13:08:37 -07:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
fhenry
4ff5922a55 Fix pgSQL bug 2013-04-26 12:53:13 +02:00
fhenry
9e1487fc61 Fix bug Pgsql 2013-04-26 12:44:21 +02:00
Marcos García
6ac6f6e911 Fixed bug #846: Create a supplier invoice (without project) 2013-04-26 06:34:41 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
86ea79c860 Fix: dol_check_secure_access_document is also used by viewimage. This 
also solve bug of not found supplier doc and solve some security holes.
 2013-04-25 10:06:54 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
87ce23c4b8 Merge pull request #858 from marcosgdf/fix-notifications-alert-bug 
Notifications popup messages were not showing real notifications that we...
 2013-04-21 16:08:33 -07:00
Laurent Destailleur
5893fadb58 Look: Minor style enhancement 2013-04-21 17:56:29 +02:00
Marcos García
5b248805c2 Notifications popup messages were not showing real notifications that were going to be sent 2013-04-21 14:24:19 +02:00
Maxime Kohlhaas
ef13ea8690 New # 786 : can link project from supplier invoice creation 2013-04-20 14:33:00 +02:00
Juanjo Menent
2d9da0c4cf Merge pull request #848 from GPCsolutions/note 
Note update fixes batch
 2013-04-20 00:43:05 -07:00
Raphaël Doursenaud
e1a3d46ea0 Fixed for new API for note update 2013-04-20 06:43:13 +02:00
Regis Houssin
556574cbc9 FIXME: this field not exist in llx_product_fournisseur_price 2013-04-19 13:47:30 +02:00
Regis Houssin
17d5ab9774 Fix: no result with a number with a comma 
Conflicts:
	htdocs/fourn/facture/index.php

Change-Id: I6c67e3d2936673ea0993adfa1597bd11caf125fe
 2013-04-19 09:57:13 +02:00
Regis Houssin
45300ccdd8 Fix: no result with a number with a comma 2013-04-19 09:55:22 +02:00
Laurent Destailleur
d3f29649d5 Fix into div/br 2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
Marcos García
ac0cd975cd Added missing table head strings into supplier invoices 2013-04-13 13:03:13 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
Laurent Destailleur
f5c0886cb1 Fix: another not complete change for adding ref for supplier invoices. 2013-04-12 00:22:53 +02:00
Laurent Destailleur
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
Regis Houssin
030752c4c6 Fix: missing to rename constant 2013-04-11 17:24:17 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Grand Philippe
fbe5947bc2 prepair for insert ExtraFields 2013-04-08 17:17:13 +02:00
Laurent Destailleur
12cae7ebdf Fix: No warning if due date unknown 2013-04-07 21:13:48 +02:00
Laurent Destailleur
6e5f1c5d31 Fix: Some regressions 2013-04-07 17:57:17 +02:00
Laurent Destailleur
4ceeea4a1c Fix: Can't reset payment due date 2013-04-07 14:41:08 +02:00
Laurent Destailleur
87b50f9ced Fix: Can't reset payment due date 2013-04-07 14:36:22 +02:00
Laurent Destailleur
a5f72bfb4e Fix: Some fix after patch merge. 2013-04-05 22:38:46 +02:00
Laurent Destailleur
7ebd24daea Merge pull request #805 from zedzedtop/develop 
Develop
 2013-04-05 13:28:58 -07:00
Grand Philippe
cdbffe2d0a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-04-02 08:50:35 +02:00
Laurent Destailleur
6b13e8242a Fix: Restore backward compatibility 2013-04-01 23:47:48 +02:00
Grand Philippe
8dd8ccad2e fix: some issue on the road to numbering supplier invoice 2013-04-01 23:28:44 +02:00
Laurent Destailleur
110d0f1d3b Fix: Better error management 2013-04-01 22:35:54 +02:00
Laurent Destailleur
7d32db73c6 Fix: Restore lost commit. 2013-04-01 20:59:51 +02:00
Grand Philippe
e2623c6ad5 try to fix :supplier invoice numbering 2013-04-01 16:04:15 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
e0baa0fe46 Generalize fix: file with a specific mask not found, again 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
 2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba Generalize fix: file with a specific mask not found, again 2013-03-30 13:54:46 +01:00
Grand Philippe
11d2cb1e1c fix: ref_suplier instead of ref for add numbering for supplier invoice 2013-03-29 17:18:47 +01:00
Grand Philippe
f57320e697 add numbering for supplier invoice 2013-03-29 15:36:54 +01:00
Sébastien de Chateauvieux
5921033f94 TVA NPR : Change field name recuperableonly to info_bits 2013-03-28 09:51:49 +04:00
Laurent Destailleur
6c1bbd3aeb New: Uniformize hooks. 2013-03-27 14:24:33 +01:00
Laurent Destailleur
393cecb1c2 New: Add hook 2013-03-27 14:08:15 +01:00
Laurent Destailleur
982b3e9d66 Add trigger into delete line for supplier invoice 2013-03-27 13:59:45 +01:00
Sébastien de Chateauvieux
bbbc4ad8c4 TVA NPR: add parameter in function call. Accept * tva 2013-03-26 07:57:19 +04:00
Maxime Kohlhaas
83def2cd57 Fix : on a new trigger, using $this but not in a class... 2013-03-25 18:03:42 +01:00
Sébastien de Chateauvieux
b2b0d1616d TVA NPR : add fourn_tva_npr property in class ProductFournisseur 2013-03-25 17:32:22 +04:00
Sébastien de Chateauvieux
6cfedfff9f TVA NPR : add info_bits property in class FactureFournisseur 2013-03-25 17:18:10 +04:00
Laurent Destailleur
4fb4734eed Merge pull request #772 from grandoc/develop 
fix : trad error
 2013-03-24 15:08:24 -07:00
Laurent Destailleur
4e029bf2ca Fix: Security does not need special case 2013-03-24 21:06:45 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
Grand Philippe
8931a19b7e try to fix : cannot display numbering models 2013-03-16 17:25:39 +01:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
simnandez
8114249fca [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Supplier order
 2013-03-12 15:06:38 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
51d23d7c48 Merge fix of 3.3 2013-03-02 16:17:12 +01:00
Laurent Destailleur
81a06507fa Fix: data not refreshed 2013-03-02 16:01:46 +01:00
Maxime Kohlhaas
cd5bda27f4 Supplier dispatch : add new trigger called after order is dispatched 2013-02-25 16:56:37 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
c88f2bcb45 english standardization 2013-02-22 17:43:33 +01:00
Maxime Kohlhaas
2f5bf06aed Supplier order : add trigger on product dispatch 2013-02-21 17:32:57 +01:00
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also 
fix missing combo box of contacts onto CC.
 2013-02-12 17:08:21 +01:00
Laurent Destailleur
e5e9dc404b Fix: Bad choice of template 2013-02-10 21:57:53 +01:00
Laurent Destailleur
28fa96b516 Fix: Bad choice of template 2013-02-10 21:56:29 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Regis Houssin
e3be718a57 Fix: wrong object name 2013-01-25 12:38:41 +01:00
Regis Houssin
7983b1dec5 Fix: wrong object name 2013-01-25 12:37:03 +01:00
Regis Houssin
9868880142 Fix: missing files library 2013-01-23 11:29:58 +01:00
Regis Houssin
c66c02e745 Fix: missing files library 2013-01-23 11:28:11 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
7002b328a8 Fix: [ bug #685 ] Supplier invoices should use encoding sequence number 
as secondary sorting field
 2013-01-19 15:32:03 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php
 2013-01-16 14:11:19 +01:00
fhenry
b8dfee2a3b Fix bug [ bug #692 ] Can't search for suppliers invoice 2013-01-15 23:03:03 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
Laurent Destailleur
567cd00f5c Fix: Lost button 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/facture/fiche.php
 2013-01-06 13:33:09 +01:00
Laurent Destailleur
5f99488c99 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/es_ES/admin.lang
 2013-01-05 16:41:08 +01:00
simnandez
c0246c07b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 16:03:00 +01:00
simnandez
c639d80372 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:47:54 +01:00
simnandez
32b19802b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:43:40 +01:00
Laurent Destailleur
4fe1ba33f9 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
 2012-12-30 18:00:07 +01:00
Laurent Destailleur
df43d477fc Merge pull request #562 from simnandez/3.3 
Fix: Supplier is mandatory into adding invoice suppliers
 2012-12-30 08:38:34 -08:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
simnandez
9732a2f336 Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:26:18 +01:00
simnandez
f0f45b70da Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:24:20 +01:00
Laurent Destailleur
2d0dea18ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/bank/search.php
 2012-12-29 17:38:12 +01:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Marcos García
0c113d33a6 Removed unuseful code 
Some lines may be marked as changed but they are not because of incorrect line endings
 2012-12-29 13:12:45 +01:00
Marcos García
c8eac78a8d Translated labels that weren't being translated and improved es_ES translations 2012-12-29 00:24:55 +01:00
Laurent Destailleur
ec767a9772 Correct path determination if origin is project 2012-12-21 15:39:21 +01:00
Christophe Battarel
88db3da002 allowing product search by supplier ref 2012-12-05 19:51:25 +01:00
Maxime Kohlhaas
64f5d59ddf Fix : on supplier bill validation, question about stock was asking for stock decrease instead of increase 2012-12-05 15:42:59 +01:00
Laurent Destailleur
5d27fd61df Beautify instal pg. 
Fix: Debian package
Restore PHPUnit test (A PHP Unit test that fails should not be removed
but fixed and be kept in error until fix is published. Otherwise,
PHPUnit are useless).

Conflicts:
	htdocs/install/fileconf.php
	htdocs/install/inc.php
 2012-12-05 00:45:10 +01:00
Regis Houssin
c0fba8262f FIXME pending correction of the "addline" method 2012-12-03 11:20:03 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
4abae05c26 Qual: Uniformize behaviour of product selection 2012-11-26 13:37:40 +01:00
Laurent Destailleur
b977ea5d87 Fix: Regression. Show bad error message when we add a product with no 
prices defined.
 2012-11-25 20:38:39 +01:00
Laurent Destailleur
6db5185d7e Fix: Missing include 2012-11-20 23:57:35 +01:00
Regis Houssin
8e141fce14 Fix: strict mode father 2012-11-13 22:43:54 +01:00
Laurent Destailleur
e7164cb243 Fix: Some checkstyle errors 2012-11-11 18:18:57 +01:00
Laurent Destailleur
027ad065a5 Removed TODO 2012-11-05 12:04:13 +01:00
Laurent Destailleur
80c252dd62 Fix: Use same labels to go back to draft than other elements. 
Re-open is for "closed" to a validated status.
Modify is for a validated status to draft.
 2012-11-03 21:33:55 +01:00
Regis Houssin
77e45f70a4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-03 19:16:02 +01:00
Regis Houssin
d0dc336a85 New: jQuery and jQuery UI upgrade 
New: jQuery Timepicker addon for Datepicker
 2012-11-03 19:15:45 +01:00
Laurent Destailleur
078b015db8 Work on multitax (vat). Need your test. 
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
 2012-11-03 16:32:49 +01:00
Laurent Destailleur
f571adf62e Fix: For supplier invoice, we must use properties of supplier to know if 
seller use localtax RE and IRPF.
 2012-11-03 12:19:47 +01:00
Regis Houssin
b952a7f9bf Fix: convert line delimiters (use the last eclipse version) 2012-10-28 13:57:21 +01:00
Christophe Battarel
2272d13f5a fix minor bug in invoice creation from another object 2012-10-25 15:50:43 +02:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Regis Houssin
1cbd2a1b1c Fix: broken feature 2012-10-25 08:45:35 +02:00
Regis Houssin
1c84dbaeec Fix: missing zipcode in url 2012-10-24 12:27:43 +02:00
Regis Houssin
87d44c845d Fix: restrict the search in the beginning 2012-10-24 11:18:15 +02:00
Christophe Battarel
41541e4bc2 add charges and unitcharges in update statement 2012-10-23 10:54:35 +02:00
Regis Houssin
a240343482 Fix: add possibility to filter with zipcode (very important) 2012-10-22 11:05:55 +02:00
Regis Houssin
f89e3238ee New: try to use hooks for customizing lists 2012-10-22 10:49:16 +02:00
Laurent Destailleur
4a10874f54 New: add waring message when date is too low. 2012-10-19 13:01:29 +02:00
Regis Houssin
d705995a49 Fix: convert line delimiters 2012-10-18 10:36:53 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Christophe Battarel
8f08d7a166 add entity in the unique key for delete 2012-10-17 14:25:43 +02:00
Christophe Battarel
e8b92cc2c5 correct bug in price delete 2012-10-17 12:47:40 +02:00
Regis Houssin
15aa2497ab Fix: compatibility with multicompany sharings 2012-10-16 17:59:00 +02:00
Laurent Destailleur
8ff506b120 Sec: Sanitize all params page, sortfield and sortorder 2012-10-13 14:47:46 +02:00
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e Merge pull request #429 from atm-maxime/mko559 
Task # 559 : add discount on supplier prices
 2012-10-01 13:31:17 -07:00
Maxime Kohlhaas
8a62af1c78 Task # 559 : added use of discount in supplier bills 2012-10-01 11:49:20 +02:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Maxime Kohlhaas
1d21f24fa7 Task # 559 : Add possibility to define a discount for min quantity on supplier product prices 2012-10-01 11:25:17 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Laurent Destailleur
e7203fa4f3 New: The discount on line for supplier invoices is now supported 2012-09-28 16:08:44 +02:00
Laurent Destailleur
5ea03e7448 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-19 20:45:43 +02:00
Laurent Destailleur
8b0cc3a953 Fix: Date format 2012-09-19 20:45:20 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Laurent Destailleur
1347ecf14e Qual: Removed warnings 2012-09-19 12:49:58 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Laurent Destailleur
c10e587870 Fix: Bad init of specimen 2012-09-11 15:42:41 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Laurent Destailleur
0cf89eac08 Doxygen 2012-09-08 02:17:08 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Laurent Destailleur
efc61be1a4 Fix: Rounding at wrong place 2012-08-26 18:27:15 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
6fe631378b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-25 11:28:08 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Marcos García
082753d115 Refactored code 2012-08-24 19:55:31 +02:00
Marcos García
977571e032 Forgot to apply the patch to the rest of the files 2012-08-24 18:32:19 +02:00
Regis Houssin
6a60551fdd Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-08-23 17:19:05 +02:00
Marcos García
0ecfe0465e Fixed bug #499 
The input method of supplier orders wasn't being translated
 2012-08-23 09:20:30 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Regis Houssin
09e34068bc Merge pull request #319 from marcosgdf/translations 
A lot of improvements into translations
 2012-08-17 22:22:56 -07:00
Regis Houssin
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
878f54b1e9 Fix: invoice supplier, disable "add" button and show error message if a 
product with no supplier price is selected
 2012-08-17 17:23:36 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no 
supplier price is selected
 2012-08-17 16:58:57 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
Regis Houssin
4825448ced Merge pull request #315 from marcosgdf/error-messages 
Forgot to migrate to some lines to the new error-handler
 2012-08-16 13:59:05 -07:00