Commit Graph

1100 Commits

Author SHA1 Message Date
BENKE Charlie
fc8daef78d increase size of libellé if we use paypal and email
in case of long email the field is to small
2015-07-06 17:46:36 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
5f07c18e06 NEW Add opportunity amount on project card. 2015-06-29 16:57:32 +02:00
aspangaro
385857380b Remove old field 2015-06-23 06:39:55 +02:00
aspangaro
20582b9ea5 Merge remote-tracking branch 'Upstream/develop' into develop-36 2015-06-21 07:31:43 +02:00
Laurent Destailleur
4f1538f502 Introduce table llx_c_holiday_type 2015-06-21 03:19:15 +02:00
Laurent Destailleur
e0d1cbeb16 Introduce table llx_c_holiday_type 2015-06-21 00:07:03 +02:00
aspangaro
0ff97da1ea Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT 2015-06-20 09:06:20 +02:00
aspangaro
50aa36502c Merge remote-tracking branch 'Upstream/develop' into develop-32
Conflicts:
	htdocs/expensereport/card.php
2015-06-17 07:21:43 +02:00
aspangaro
8d0e7261f5 Debug 2015-06-17 07:19:25 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6 Merge pull request #2412 from marcosgdf/commercial-name
NEW [ task #851 ] Add a new field: Commercial name
2015-06-16 11:44:03 +02:00
aspangaro
a23994055a Add field and table in database & migration script 2015-06-16 05:47:19 +02:00
Marcos García de La Fuente
a496606826 Merge branch 'develop' into commercial-name
Conflicts:
	htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Raphaël Doursenaud
3f2b543ae4 Fix #2899: Reintroduce missing field 2015-06-11 10:53:40 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
Laurent Destailleur
c9d63238ca Add fields at bank account description to manage corretly sepa
generation.
2015-06-01 13:19:02 +02:00
Laurent Destailleur
e9687cbc4f Fix the amount for entry price must use the format dedicated to amount. 2015-05-31 18:23:11 +02:00
Laurent Destailleur
7a0ec2d831 Prototype with datatables works now also ith jmobile.
Add field fifo and lifo into product table.
2015-05-30 23:56:42 +02:00
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Raphaël Doursenaud
38a9f6edae Drop deprecated fields
Fix #2870
2015-05-21 16:32:46 +02:00
Laurent Destailleur
15c355efc9 A ref field must never be null. 2015-05-18 22:31:14 +02:00
Laurent Destailleur
36d164f779 Add field gender into table of user. 2015-05-17 23:43:57 +02:00
Laurent Destailleur
851007f1a8 Prepare database to manage recurring events 2015-05-17 20:12:49 +02:00
Marcos García de La Fuente
e2b2c1c8bd Merge branch 'develop' into commercial-name
Conflicts:
	htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
74607218ea Fight against key tva_taux. Removed completely. 2015-05-14 15:59:09 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Laurent Destailleur
a94121a8c5 Add field to define picto to use for status 2015-05-12 09:42:14 +02:00
Marcos García de La Fuente
ce7ed70d74 Merge branch 'develop' into commercial-name
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Laurent Destailleur
e6e263d13f Add field to manage reccuring events 2015-05-06 16:44:41 +02:00
jfefe
24bf614061 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-05-06 01:00:11 +02:00
Laurent Destailleur
b0baed83fc Prepare for email tracking 2015-05-05 21:50:48 +02:00
jfefe
4bce903c63 Add field into user table to store API key 2015-05-02 15:26:45 +02:00
Laurent Destailleur
125c821bc4 add comment 2015-04-24 20:47:45 +02:00
Laurent Destailleur
5b758e0e16 Fix migration process 2015-04-22 00:17:03 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00
Marcos García de La Fuente
15b1f03a08 Merge branch 'develop' into commercial-name
Conflicts:
	htdocs/comm/list.php
	htdocs/comm/prospect/list.php
	htdocs/societe/consumption.php
	htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
2015-04-18 23:38:14 +02:00
Florian HENRY
11e1d0310c typo 2015-04-18 23:00:22 +02:00
Florian HENRY
f2018b7946 fix bug #2652 2015-04-18 22:59:20 +02:00
Laurent Destailleur
9dd73de9b0 Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:47:20 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Florian HENRY
e15d4c045d NEW : Propal merge product card PDF into azur 2015-04-18 18:44:05 +02:00
Maxime Kohlhaas
7223495ac2 Fix : date_delivery was not a datetime 2015-04-18 04:21:16 +02:00
Maxime Kohlhaas
07fd6a3ae7 Fix : delivery date was not a datetime 2015-04-18 04:18:40 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
c25872b182 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-10 10:21:10 +02:00