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
Laurent Destailleur
f64cb085a7 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-08-30 18:27:34 +02:00
Laurent Destailleur
79b081a7b7 Merge pull request #1845 from Cubexed/patch-1 
Fix unable to delete order line
 2014-08-28 12:00:21 +02:00
Philippe GRAND
08c621037c fix : missing code for extrafields 2014-08-27 11:41:18 +02:00
Cubexed
00856eb277 Merge remote-tracking branch 'upstream/develop' into develop 2014-08-26 17:29:42 +02:00
Cubexed
a97241f716 Fix unable to delete order line 
Calling trigger without having globalized $conf causes error and cancels delete operation, this commit adds the missing

2014-08-23 16:52:05 ERR     127.0.0.1        Interfaces::run_triggers was called with wrong parameters action=LINEORDER_SUPPLIER_DELETE object=1 user= langs= conf=
 2014-08-23 17:05:08 +02:00
Raphaël Doursenaud
1d5fb1320b Fix: missing global declarations 2014-08-20 19:03:58 +02:00
Cubexed
ecd90ddbff Enables the fetching and saving of start and end dates in supplier order lines. 2014-08-18 23:02:04 +02:00
Laurent Destailleur
3e9ddbfcd0 Fix: [ bug #1547 ] Untranslated Paiementfourn.class.php error messages 2014-08-17 00:38:09 +02:00
Florian HENRY
bab7533578 Enable supplier price log table 2014-08-12 18:16:59 +02:00
Laurent Destailleur
59e98f97e3 Merge branch 'develop' of github.com:grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-07-31 17:47:32 +02:00
Philippe Grand
5aea97affd Update fournisseur.commande.class.php 
missing code for extrafields
 2014-07-31 17:02:17 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
KreizIT
b6edde320b Conflict solved 2014-07-12 09:20:00 +02:00
KreizIT
9c2aaf7d23 [ Task #1495 ] Add trigger LINECONTRACT_CREATE 2014-07-12 00:27:33 +02:00
KreizIT
ff19a87941 [Task #1481] Enable BILL_SUPPLIER_MODIFY trigger 2014-07-11 23:40:17 +02:00
KreizIT
5e7c0639b0 Refactor: various trigger 2014-07-11 16:02:27 +02:00
KreizIT
5093fecc60 Refactor: SUPPLIER_PRODUCT_BUYPRICE_ * trigger 2014-07-11 15:50:40 +02:00
KreizIT
42ef7149fd Refactor: BILL_SUPPLIER_* and LINEBILL_SUPPLIER_* trigger 2014-07-11 15:48:25 +02:00
KreizIT
bbdaa59921 Refactor: ORDER_SUPPLIER_* and LINEORDER_SUPPLIER_* trigger 2014-07-11 15:32:23 +02:00
frederic34
742bdcb715 Set bank account for supplier invoices 2014-07-09 18:44:20 +02:00
frederic34
387d36e4b0 Ste bank account for supplier order 2014-07-09 18:00:21 +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
14de1d66c0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-29 23:56:23 +02:00
Laurent Destailleur
dd1c5ce3d8 Fix: Missing commit 2014-06-28 15:03:11 +02:00
Laurent Destailleur
2c493a4fe3 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-06-28 14:55:04 +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
Laurent Destailleur
0b38fcb830 Merge pull request #1604 from atm-alexis/develop_add_delivery_column_on_supplier_order 
Develop - add delivery column on supplier order
 2014-06-26 21:13:20 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +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
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +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
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +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
Alexis Algoud
2f78446433 FIX alert for supplier order wasn't on delivery_date if exist 2014-05-15 11:43:55 +02:00
Laurent Destailleur
dd81cda210 Use 'auto' mode for all input done from user interface 2014-05-13 14:07:57 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +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
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