Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,239 Commits 36 Branches 190 Tags
2e68b51a107c9ad90c2d9fee5f9e5f33939b2caa
Commit Graph

1051 Commits

Author SHA1 Message Date
Laurent Destailleur
c19ff003ea Merge pull request #2292 from FHenry/develop_contract_line_extrafileds 
NEW: contract lines extrafileds
 2015-01-31 19:43:37 +01:00
Frédéric FRANCE
8d45d3cd59 Update 3.7.0-3.8.0.sql 2015-01-31 15:51:55 +01:00
Laurent Destailleur
1c7feb67ea Merge branch 'dinamic-prices-product' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
 2015-01-31 14:53:14 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
43702cf662 New: Enhance stock management: Introduce tag to define if a subproduct 
must have stock decreased and add inventory code on stock movements.
 2015-01-30 01:51:28 +01:00
Florian HENRY
66c73ca336 add missing files for contract line extrafields 2015-01-27 12:57:36 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
667565f04f Fix missing table in migration script 2015-01-19 02:38:24 +01:00
Laurent Destailleur
fdaa930507 Solve phpunit. 
Fix database field format
 2015-01-19 01:58:48 +01:00
Laurent Destailleur
28148f8637 Fixed: Bad sql requests 2015-01-18 20:49:57 +01:00
Laurent Destailleur
34fe87536b Merge pull request #2137 from frederic34/printipp 
Printing System which may accept modules
 2015-01-18 13:09:41 +01:00
Laurent Destailleur
eaacb3c33b Merge pull request #2257 from IonAgorria/per-entity-smtp 
Store per entity SMTP configuration
 2015-01-18 12:33:08 +01:00
Laurent Destailleur
1681e3b03d Fix: Not allowed types 
(http://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs)
 2015-01-18 11:36:15 +01:00
Ion Agorria
48c6897f75 Store per entity SMTP configuration 2015-01-18 03:20:35 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Laurent Destailleur
2bf2c8fce7 Restore all requets 2015-01-06 00:34:23 +01:00
Laurent Destailleur
033757aafd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-01-06 00:33:28 +01:00
Laurent Destailleur
a668d163fd Repair corrupted data 2015-01-06 00:27:35 +01:00
frederic34
e937039596 Merge remote branch 'upstream/develop' into printipp 2014-12-28 11:59:58 +01:00
Ion Agorria
5bbcb58b44 Added expressions for product/service prices 2014-12-28 01:26:41 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
420ebe0be9 Fix: Change order to create fields 2014-12-26 04:04:16 +01:00
Laurent Destailleur
08fd74e79e Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier 
invoices list
 2014-12-25 12:07:27 +01:00
Laurent Destailleur
2b4edd9996 Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier 
invoices list
 2014-12-23 13:21:40 +01:00
frederic34
3bf63ed0a9 Merge remote branch 'upstream/develop' into printipp 2014-12-21 14:59:37 +01:00
Ying-Chun Liu (PaulLiu)
71c5f81bdf Handle updates for Taiwan VAT. 
Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
 2014-12-16 00:48:35 +08:00
frederic34
295fe115ab Merge remote branch 'upstream/develop' into printipp 2014-12-08 20:33:50 +01:00
frederic34
be60c13de6 WIP Printing System 2014-12-08 20:33:26 +01:00
Laurent Destailleur
634a9d8402 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-12-07 19:19:48 +01:00
Laurent Destailleur
0459477097 Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
Laurent Destailleur
1e8e4e7fda Prepare 3.8 dev 
Fix bad test.
Renamed table for dynamic prices.
 2014-12-03 17:06:44 +01:00
Laurent Destailleur
1653384415 Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices 2014-12-03 13:14:35 +01:00
Laurent Destailleur
55b7bb532d Fixed: Bad field of default value for fields into predefined/recuring 
invoice tables.
 2014-12-01 23:50:03 +01:00
Ion Agorria
0fafe3f7d2 Required SQL changes for dinamic prices 2014-11-29 06:31:54 +01:00
Laurent Destailleur
31a5a46ffa Merge pull request #2022 from asirinelli/3.7 
Add EIRL in llx_c_forme_juridique
 2014-11-22 16:00:32 +01:00
Laurent Destailleur
dfae42cd4a Merge pull request #2051 from aspangaro/1690 
#1672 VAT accounts by default are lost in migration
 2014-11-22 15:41:58 +01:00
Laurent Destailleur
b5e64b66c8 Merge pull request #2025 from GPCsolutions/dbupgrade 
Work around tms bugs with MariaDB
 2014-11-22 15:26:42 +01:00
aspangaro
621f2b5c77 #1672 VAT accounts by default are lost in migration 2014-11-18 21:28:12 +01:00
Laurent Destailleur
31f987706c Fix: bugs reported by scrutinizer 2014-11-17 15:13:23 +01:00
Raphaël Doursenaud
079dbf9fbd Work around bug #1644 2014-11-17 14:59:14 +01:00
Antoine Sirinelli
ec20b38adc Add EIRL in llx_c_forme_juridique 
This a not so new French type of company: Entreprise Individuelle à
Responsabilité Limitée (EIRL).
Migration script also added.
 2014-11-16 23:56:10 +01:00
Laurent Destailleur
10117d045f Fixed #1637 2014-11-16 16:15:31 +01:00
Laurent Destailleur
11eb7de596 Try to clean sql to avoid mysql bug 2014-11-15 14:14:52 +01:00
BENKE Charles
6cee8e1294 Update 3.6.0-3.7.0.sql 
increase fieds size of ref supplier (order and bill)
 2014-11-13 11:24:45 +01:00
Laurent Destailleur
7177c04378 Minor css enhancement 2014-11-11 20:45:30 +01:00
Laurent Destailleur
9ae03f533d Test 2014-11-08 00:35:28 +01:00