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

386 Commits

Author SHA1 Message Date
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
BENKE Charles
def7d1d2c8 Update fournisseur.commande.class.php 
$id not defined but used
 2014-04-06 21:21:08 +02:00
Laurent Destailleur
0e23892c71 More consistency trigger name 2014-04-02 15:05:03 +02:00
Laurent Destailleur
637b47cd08 Merge pull request #1522 from GPCsolutions/triggernames 
Qual: keep trigger naming consistent
 2014-04-02 15:02:42 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Raphaël Doursenaud
3b9696351e Qual: keep trigger naming consistent 2014-04-02 12:22:38 +02:00
Christophe Battarel
fff9bc1b00 fix bad attribute name 2014-04-01 11:14:54 +02:00
Christophe Battarel
ea74c4738e add trigger CREATE_BUYPRICE 2014-04-01 10:23:57 +02:00
Laurent Destailleur
2396382ccb Fix: Syntax error 2014-03-30 18:25:20 +02:00
Laurent Destailleur
b1498c584d Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into 
KreizIT-dluo_step5

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-16 20:49:56 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
KreizIT
3782742aad - add batch management on supplier dispatch product 
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
 2014-03-15 10:28:01 +01:00
Maxime Kohlhaas
67342486a6 Task 1074 : add link to source document on stock movement 2014-03-15 02:18:39 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
325b9c9688 Qual: Removed dead code 2014-03-01 14:54:11 +01:00
Laurent Destailleur
ea773531b5 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:49:30 +01:00
Marcos García de La Fuente
607effdc7a Replacing invoice integer types with FactureFournisseur constants 2014-02-26 01:09:34 +01:00
Laurent Destailleur
f743cbafa2 Fix: doxygen 2014-02-10 01:43:35 +01:00
geoffrey.girard
c7f8699973 correction : delete trigger must be called before the delete of object 2014-02-05 09:19:14 +01:00
geoffrey.girard
676101b02f Add trigger on deleteline for supplier order and move trigger on deleteline for supplier invoice after delete sql query 2014-02-04 17:35:27 +01:00
Laurent Destailleur
0d0fda8fae Merge pull request #1382 from atm-geoffrey/develop 
Add new doActions and formObjectOptions hook on supplier prices page
 2014-01-27 01:43:08 -08:00
Laurent Destailleur
7986c95ce3 Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:26:42 +01:00
Laurent Destailleur
372acbfb0d Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:25:42 +01:00
geoffrey.girard
7f59def98b Correction trigger on update product buyprice 2014-01-22 10:44:23 +01:00
BENKE Charles
0d80d9331f Update fournisseur.class.php 
wrong object
 2014-01-19 15:44:58 +01:00
geoffrey.girard
8729790016 Add trigger on update product buyprice 2014-01-17 10:38:18 +01:00
Laurent Destailleur
af4d48aec0 Fix: If end date is not defined, we can't say it is too late. 2014-01-15 15:42:14 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +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
Christophe Battarel
7dbe2bcf2c fix wrong buy price update 2013-11-13 18:41:31 +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
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
Cédric Salvador
967c20e3e9 Improved error message 2013-09-16 14:51:22 +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
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
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
Florian Henry
cb86cd403c Fix: Delete linked element to supplier invoice when deleted (as done for 
all other object into dolibarr)
 2013-09-03 20:01:10 +02:00
Laurent Destailleur
1f6d0ab3ef Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2013-08-27 09:36:54 +02:00
Raphaël Doursenaud
dcc87263d0 Update parameter as expected by the function name 2013-08-26 18:26:11 +02:00
Maxime Kohlhaas
bfb01da04f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011 2013-07-30 16:22:13 +02:00
Maxime Kohlhaas
5a38a43c87 Task # 1011 : now supplier order and invoice deal with payment terms and mode 2013-07-30 16:21:39 +02:00
Cédric Salvador
435deae5e9 removed one-liner 2013-07-29 12:31:15 +02:00
Cédric Salvador
14ea02ecac copyright 2013-07-29 12:31:06 +02:00
Cédric Salvador
b8f5aef27f some improvement to the wizard UI 2013-07-29 12:31:05 +02:00
Maxime Kohlhaas
029394aa3f Fix : linked object not deleted when deleting a supplier invoice 2013-07-16 16:34:06 +02:00
Laurent Destailleur
3f94950b0e Fix: Clean supplier ref 2013-07-13 16:54:17 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
1e0cb64bce Fix: Bad error management 2013-06-09 16:15:49 +02:00
Laurent Destailleur
e85b72e452 Fix: Bad error management 2013-06-09 15:59:51 +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
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
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
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
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
Maxime Kohlhaas
ef13ea8690 New # 786 : can link project from supplier invoice creation 2013-04-20 14:33:00 +02:00
Regis Houssin
556574cbc9 FIXME: this field not exist in llx_product_fournisseur_price 2013-04-19 13:47:30 +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
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
6e5f1c5d31 Fix: Some regressions 2013-04-07 17:57:17 +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
Grand Philippe
e2623c6ad5 try to fix :supplier invoice numbering 2013-04-01 16:04:15 +02: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
982b3e9d66 Add trigger into delete line for supplier invoice 2013-03-27 13:59:45 +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
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
Grand Philippe
8931a19b7e try to fix : cannot display numbering models 2013-03-16 17:25:39 +01:00
simnandez
8114249fca [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Supplier order
 2013-03-12 15:06:38 +01:00
Maxime Kohlhaas
2f5bf06aed Supplier order : add trigger on product dispatch 2013-02-21 17:32:57 +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
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +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
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +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
6db5185d7e Fix: Missing include 2012-11-20 23:57:35 +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
Christophe Battarel
41541e4bc2 add charges and unitcharges in update statement 2012-10-23 10:54:35 +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
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +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
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
Laurent Destailleur
c10e587870 Fix: Bad init of specimen 2012-09-11 15:42:41 +02:00
Laurent Destailleur
0cf89eac08 Doxygen 2012-09-08 02:17:08 +02:00
Laurent Destailleur
efc61be1a4 Fix: Rounding at wrong place 2012-08-26 18:27:15 +02:00
Marcos García
082753d115 Refactored code 2012-08-24 19:55:31 +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
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Stephen L
c1d15a9572 Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 15:50:45 +02:00
Laurent Destailleur
85f5033f47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-08 04:12:48 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation. 
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
 2012-08-08 04:12:20 +02:00
Laurent Destailleur
068c536741 Fix: Delete all files (PROV* when validating. 2012-08-07 14:24:54 +02:00
Regis Houssin
2884aac4bc Fix: delete pdf if supplier invoice is deleted 
Fix: compatibility with external modules

Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2012-08-05 18:36:20 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Laurent Destailleur
d6a5b224fb Revert bad practice: setEvent use SESSION. Such usage is limited to HTML 
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
 2012-07-29 14:15:29 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Laurent Destailleur
de621f0567 Fix: Restore compatibility. Try to isolate "charges" feature with 
a condition (i did not understand what it means and goal, i'm afraid
other users should not understand too).
 2012-07-25 11:32:48 +02:00
Marcos García
568db22649 Renamed fk_methode_commande to fk_input_method 2012-07-22 16:58:37 +02:00
Christophe Battarel
34132de71d add charges to supplier prices 2012-07-19 15:36:25 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
bf379fc242 Fix: uniformize code 2012-06-11 21:45:59 +02:00
Laurent Destailleur
dc09960143 New: Add bank account on payment list of invoice card. 2012-05-08 15:43:58 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Laurent Destailleur
b9133410c2 Qual: Uniformize code. 2012-04-28 18:49:01 +02:00
Laurent Destailleur
716b605d27 Fix: bad case of construct key word 2012-04-20 09:48:00 +02:00
Regis Houssin
65b9d6281d Merge pull request #168 from grandoc/develop 
update approve function
 2012-04-16 03:20:00 -07:00
Laurent Destailleur
9114fec4ed Doxygen 2012-04-16 12:01:32 +02:00
Grand Philippe
30c5160007 update approve function 2012-04-16 09:50:02 +02:00
Laurent Destailleur
f9e2fe0440 Fix: date must be quoted 2012-04-15 19:22:43 +02:00
Laurent Destailleur
9a70541084 Fix: Missing migration field 
Fix: Date must be quoted
 2012-04-15 18:41:38 +02:00
Grand Philippe
d79c8a3fa1 change from cloture to approve and complete function approve 2012-04-15 16:49:49 +02:00
Laurent Destailleur
c4c2b4ee7f Fix: PHP 5.4 2012-04-14 20:21:06 +02:00