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

691 Commits

Author SHA1 Message Date
KreizIT
ff19a87941 [Task #1481] Enable BILL_SUPPLIER_MODIFY trigger 2014-07-11 23:40:17 +02:00
KreizIT
42ef7149fd Refactor: BILL_SUPPLIER_* and LINEBILL_SUPPLIER_* trigger 2014-07-11 15:48:25 +02:00
frederic34
742bdcb715 Set bank account for supplier invoices 2014-07-09 18:44:20 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Juanjo Menent
11c1bdecdf [ task #1063 ] Allow edit localtaxes rate for thirds. Works with propals 2014-07-04 11:07:10 +02:00
Juanjo Menent
c7e20c9a80 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with 
Suppliers
 2014-07-04 10:25:05 +02:00
Marcos García de La Fuente
460fb7a453 Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Laurent Destailleur
b70c695776 Fix: checkstyle 2014-06-16 18:41:28 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40 More substitutions 2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
47c982c506 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2014-06-10 08:45:08 +02:00
Marcos García de La Fuente
85d906078a Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or limit date for payment 2014-06-09 23:50:57 +02:00
Laurent Destailleur
9a9b0824e7 Merge pull request #1629 from defrance69/patch-15 
Update fournisseur.facture.class.php
 2014-05-30 11:26:00 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
BENKE Charles
4418a35e51 Update fournisseur.facture.class.php 
rowid not declared but used
 2014-05-27 15:17:59 +02:00
Laurent Destailleur
44ecd504bc Fix: Field ref_supplier and label not filled. Just add FIXME because fix 
is too heavy for a maintenance release.
 2014-05-25 04:12:08 +02:00
Laurent Destailleur
ae01c785c5 Fix: Do not show ref supplier title if ref_supplier not set (currently 
always the case with 3.5).
 2014-05-25 03:57:13 +02:00
Laurent Destailleur
dd81cda210 Use 'auto' mode for all input done from user interface 2014-05-13 14:07:57 +02:00
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
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
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
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
af4d48aec0 Fix: If end date is not defined, we can't say it is too late. 2014-01-15 15:42:14 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Laurent Destailleur
51a82a2418 Fix: Clean param 2013-10-08 00:04:09 +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
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
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
Maxime Kohlhaas
5a38a43c87 Task # 1011 : now supplier order and invoice deal with payment terms and mode 2013-07-30 16:21:39 +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
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +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
8d6f959d31 Fix [ bug #864 ] fournisseur_extrafields 2013-05-01 22:57:03 +02:00
Marcos García
6ac6f6e911 Fixed bug #846: Create a supplier invoice (without project) 2013-04-26 06:34:41 +02:00
Maxime Kohlhaas
ef13ea8690 New # 786 : can link project from supplier invoice creation 2013-04-20 14:33:00 +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
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
6e5f1c5d31 Fix: Some regressions 2013-04-07 17:57:17 +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
Laurent Destailleur
982b3e9d66 Add trigger into delete line for supplier invoice 2013-03-27 13:59:45 +01: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
Laurent Destailleur
28fa96b516 Fix: Bad choice of template 2013-02-10 21:56:29 +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
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
Laurent Destailleur
e7203fa4f3 New: The discount on line for supplier invoices is now supported 2012-09-28 16:08:44 +02:00
Laurent Destailleur
8b0cc3a953 Fix: Date format 2012-09-19 20:45:20 +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
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
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
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
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Laurent Destailleur
78ae7dc075 Checkstyle 2012-03-27 09:59:28 +02:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Regis Houssin
4ecc64504d Fix: use the original json functions 2012-03-18 19:59:38 +01:00
Regis Houssin
d752e25946 New: add new notes system in contract and order/invoice supplier module 2012-03-18 11:13:01 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Laurent Destailleur
186258410e New: Add option to clean orphelins files into repair page 2012-02-08 16:41:06 +01:00
Laurent Destailleur
08e33f20dc Qual: Uniformize code 
Doxygen
 2012-01-19 09:53:27 +01:00
simnandez
136fba88ad Qual: Uniformize code 2011-12-19 17:12:29 +01:00
Laurent Destailleur
ba12c25eec Fix: Replacement of adodb is ok now. 
Fix: Search criteria lost
 2011-12-13 00:23:48 +01:00
Laurent Destailleur
b52fc32853 Fix: fix not initialized variables 2011-12-05 19:41:38 +01:00
Laurent Destailleur
3629057a40 Fix: remise_percent was lost for supplier invoice creation from order. 2011-11-23 20:26:18 +01:00
Laurent Destailleur
12963265d7 Add confirm message when going back to draft 2011-11-14 16:23:59 +01:00
Laurent Destailleur
10961fb2c9 New: Can choose warehouse for stock change on supplier approbation or 
supplier invoice validation
 2011-11-09 22:10:58 +01:00
Laurent Destailleur
3d0c324f5f Fix: Message for stock movement was wrong or missing 2011-11-08 00:03:19 +01:00
Laurent Destailleur
fd9e0d8643 Qual: Removed code that must be stored into external modules 2011-11-05 12:34:54 +01:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
eldy
47bb2171e0 Fix: Fix a serious database default. Table llx_product_fournisseur was 
linked with llx_product_fournisseur_price with a link 1-1 so was
useless. I removed it. This reduce a lot of sophisticated code and will
make import of prices easier. This also increase speed.
 2011-10-04 01:26:07 +02:00
eldy
79546fa072 Qual: Uniformize look of supplier invoice with customer invoice 2011-10-01 21:55:40 +02:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Regis Houssin
9b69ef27ba Fix: sql error 2011-09-20 16:56:53 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Laurent Destailleur
1aaf65c257 PDF works with us letter format 2011-08-31 14:42:47 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Regis Houssin
976c74ac87 Fix: uniformize code 2011-06-10 14:28:23 +00:00
Laurent Destailleur
edd91b7d26 Qual: Clean stock increase/decrease code 2011-05-23 23:46:39 +00:00
Laurent Destailleur
53966de3ab Doxygen 2011-05-22 20:42:48 +00:00
Laurent Destailleur
5440ad97c6 New: Add default label into stock movement label 2011-05-18 17:18:42 +00:00
Laurent Destailleur
66acd4ea8a New: Add option to close invoice if paiement is complete. 2011-05-11 13:19:30 +00:00
Laurent Destailleur
5d1e7c2d85 Some fixes for web services 2011-05-04 15:19:38 +00:00
Laurent Destailleur
a61cbddc3f Qual: Removed dead code 2011-03-12 00:03:26 +00:00
Laurent Destailleur
054f0cabd7 Work on Web service for supplier invoice 2011-03-09 01:41:55 +00:00
Laurent Destailleur
12d7a9686e Fix: Due date was wrong when cloning 2011-03-05 00:37:46 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Juanjo Menent
a97641eb1e Local Taxes: add funcionality for suppliers 2011-02-09 15:57:37 +00:00
Laurent Destailleur
b3280a9b96 New: Can edit label of invoice 
Qual: Fetch method is complete (used skeleton generator).
 2011-02-06 00:19:36 +00:00
Laurent Destailleur
6961a82dbf Fix: We try to create bank link record twice 
Fix: Bad url
 2011-01-15 14:01:59 +00:00
Laurent Destailleur
fcc9d4094c Fix: Some fix in PDF position 2010-12-31 10:29:44 +00:00
Laurent Destailleur
86ffc32195 Qual: Uniformize a lot of code (supplier_invoice => invoice_supplier, same for order) 
New: Add link between supplier invoices and supplier orders.
 2010-12-13 13:16:02 +00:00
Laurent Destailleur
6e75a3d203 Restore work lost by savannah backup 2010-12-01 21:16:28 +00:00
Laurent Destailleur
8bc3bae49e New: Add suppliers orders to process in dashboard 2010-11-13 17:37:22 +00:00
Laurent Destailleur
4e83c0a7ea Fix: Update of supplier invoice line 2010-10-30 10:51:56 +00:00
Juanjo Menent
e976645b08 Qual: Uniformize code (ligne -> line) 2010-10-28 08:43:53 +00:00
Juanjo Menent
9383b1a560 Task #8618: Improve module canelle (not finished). Add array line in class facture fournisseur for lib pdf compatibility. 2010-10-26 18:49:35 +00:00
Laurent Destailleur
af4fabc531 Task #8618 2010-10-19 08:01:25 +00:00
Laurent Destailleur
3fdc5f1957 New: Add protection to avoid to valid supplier invoice with a ref supplier with value "Copy of ..." 2010-10-18 18:40:17 +00:00
Laurent Destailleur
0e663354f0 Fix: Preview was broken after renaming lignes into lines 2010-10-02 11:47:15 +00:00
Juanjo Menent
bab4a6198a Task #9643: Works in Suppliers 2010-08-16 13:13:15 +00:00
Laurent Destailleur
5affcd3b3f Qual: Renamed french field "envente" into "tosell". 2010-08-11 18:35:31 +00:00
Laurent Destailleur
2db5b658f1 Fix: Some errors in vat management with multiprice 2010-07-22 21:16:29 +00:00
Laurent Destailleur
87ce3073d5 Doxygen 2010-07-21 11:57:52 +00:00
Laurent Destailleur
1083d5ca8b Serious debug of supplier order process 2010-05-28 21:52:51 +00:00
Regis Houssin
dc77231df7 Fix: change proformat to proforma 2010-05-17 15:41:17 +00:00
Laurent Destailleur
b7570ff18a Fix: Better error management 2010-05-04 18:03:45 +00:00
Laurent Destailleur
664811cfed Add more filter on list of invoices and payments 2010-05-01 15:33:00 +00:00
Philippe Grand
391c595dda according to new tree directory 2010-04-29 08:50:46 +00:00
Laurent Destailleur
4c73cb64c8 Move/Rename numbering module files for invoices to normalize code. 2010-04-28 13:49:13 +00:00
Philippe Grand
3f4bee1f18 according to new tree directory 2010-04-28 12:53:28 +00:00