Commit Graph

3690 Commits

Author SHA1 Message Date
aspangaro
845c770d01 War against colspan - Supplier payment card 2016-10-24 05:53:59 +02:00
Laurent Destailleur
39bc78909b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d Save information of vat code into database 2016-10-24 03:23:40 +02:00
Laurent Destailleur
b5b76dfaf7 Merge pull request #5889 from atm-gauthier/NEW_filter_socid_on_find_min_price_product_fournisseur
FIX param socid so find_min_price_product_fournisseur() use correct thirdparty when we create supplierorder from supplierproposal
2016-10-24 01:06:15 +02:00
Laurent Destailleur
e388feee07 Merge pull request #5771 from defrance/patch-28
Add update_total function (like on other element)
2016-10-24 00:41:27 +02:00
Laurent Destailleur
468ff6795a Merge pull request #5827 from aspangaro/5.0-p20
Work on supplier type (Replacement / deposit / credit note) invoice
2016-10-24 00:38:32 +02:00
Laurent Destailleur
9ab8f76777 Fix insert supplier invoice line 2016-10-22 18:40:21 +02:00
Laurent Destailleur
14e78ef50b Mutualize code of 2 lists into one page. 2016-10-22 13:52:43 +02:00
Sergio Sanchis Climent
78f1b428b0 FIX: Search provider by price 2016-10-19 21:42:53 +02:00
gauthier
7d63925118 NEW : param socid find_min_price_product_fournisseur() function 2016-10-18 15:35:48 +02:00
Laurent Destailleur
912ac8e3d6 Fix css 2016-10-16 21:29:12 +02:00
Laurent Destailleur
15a7262328 Fix pb with multicurrency 2016-10-16 20:33:17 +02:00
Laurent Destailleur
ee1ee1eee7 Management of the "Copy of" when cloning projects. 2016-10-16 12:12:45 +02:00
Laurent Destailleur
dfbca2d0ad Merge pull request #5868 from olsesacl/#5830
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Laurent Destailleur
28f64e78eb Debug multicurrency 2016-10-13 21:25:13 +02:00
Laurent Destailleur
78e8ab64aa Debug multicurrency 2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Laurent Destailleur
265131e815 Remove old comments 2016-10-04 12:54:02 +02:00
Laurent Destailleur
d81cd7ebbe NEW Can link template invoice to other objects. Generated invoice will
be linked to same objects.
2016-10-04 11:14:00 +02:00
aspangaro
99271ca550 Merge remote-tracking branch 'Upstream/develop' into 5.0-credit_note 2016-10-03 20:42:34 +02:00
aspangaro
41b6101a75 Work on supplier type (Replacement / deposit / credit note) invoice 2016-10-03 20:41:39 +02:00
Laurent Destailleur
e17eea5ea5 Merge pull request #5825 from aspangaro/5.0-p20
Work on supplier type (Replacement / deposit / credit note) invoice
2016-10-03 00:50:08 +02:00
Laurent Destailleur
6ac39b97e4 Fix restore list of attached files into action report 2016-10-03 00:38:28 +02:00
aspangaro
a328e673a3 Work on supplier type (Replacement / deposit / credit note) invoice 2016-10-02 21:39:24 +02:00
Laurent Destailleur
fe7e600dd3 Merge pull request #5820 from IonAgorria/fixcloneline
FIX: cloned supplier order lines not having all parameters
2016-10-01 18:59:57 +02:00
aspangaro
cf883e0eeb Update fournisseur.facture.class.php 2016-10-01 06:19:22 +02:00
Ion Agorria
0816cc87c3 Fix cloned supplier order lines not having all parameters 2016-09-30 20:09:59 +02:00
Laurent Destailleur
b2307f9b90 Uniformize code 2016-09-28 21:08:25 +02:00
altoch
77528d45c4 FIX: Filter search montant ht sql statement 2016-09-28 20:15:59 +02:00
Laurent Destailleur
86d86f8442 NEW #5801 More complete change to allow to disable supplier invoice
document generation
2016-09-28 18:59:44 +02:00
vinclar
00ebff816d Correct filter refsupplier
Bad reference
2016-09-28 14:20:54 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/facture.php
2016-09-21 18:38:30 +02:00
BENKE Charlie
f826013cb3 Update fournisseur.facture.class.php 2016-09-21 12:07:43 +02:00
BENKE Charlie
c713eb987e Update fournisseur.facture.class.php 2016-09-21 12:06:39 +02:00
BENKE Charlie
cb736f5b93 Add update_total function (like on other element)
the goal is to have and use the same function in all the native standard element (proposal, order, bill / customer and fournish)
2016-09-21 12:05:18 +02:00
Laurent Destailleur
1c15539bb4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-21 01:27:25 +02:00
Laurent Destailleur
f1bb69eecf Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-21 01:26:03 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
d1c4f02bf7 Uniformize code and style 2016-09-18 14:41:17 +02:00
Laurent Destailleur
a4c3a4588d FIX link "back to list" was not visible. 2016-09-18 14:12:49 +02:00
Laurent Destailleur
81590e3833 Merge pull request #5757 from IonAgorria/fix-sorder-insert
FIX: Wrong line insert trigger in supplier order
2016-09-17 17:47:16 +02:00
Ion Agorria
7fe0c4211c Move order supplier deleteline code to line class 2016-09-17 02:35:02 +02:00
Ion Agorria
54756ef729 Fix wrong trigger in supplier order 2016-09-15 23:45:13 +02:00
Maxime Kohlhaas
5840ed8258 No ORDER BY needed for a COUNT sql, causes PGSQL error 2016-09-15 12:08:47 +02:00
Ion Agorria
2bc41a1fd0 Fix ref supplier not recorded in addline 2016-09-13 18:41:13 +02:00