Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,006 Commits 36 Branches 190 Tags
fe3939debee233a079629b59b18bfbb3432da701
Commit Graph

876 Commits

Author SHA1 Message Date
aspangaro
fe3939debe Drop old index 2014-08-14 06:42:28 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
Laurent Destailleur
2bfde7ba30 Add table llx_holiday_types to store type of leave. 2014-08-06 03:01:17 +02:00
Laurent Destailleur
f863604621 Prepare table for email templates. 2014-08-05 12:28:10 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
96362b40e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-04 10:55:09 +02:00
Laurent Destailleur
be89fddc52 Uniformize field list 2014-08-04 10:54:22 +02:00
Laurent Destailleur
b5bb4c639c Fix: Clean data 2014-08-04 00:15:23 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
bf7a33494e Run request to clean data 2014-08-03 23:55:33 +02:00
Laurent Destailleur
c11ff57fbe Fix: The type is a code so must not contains any space. 
Fix: State is not linked to region.
 2014-08-03 11:17:24 +02:00
Laurent Destailleur
331cb38a10 A little clean of tables. 2014-08-02 21:56:39 +02:00
Laurent Destailleur
8ed21f606e Qual: states are linked to regions. 2014-08-02 21:16:43 +02:00
Laurent Destailleur
2d97ad5177 Merge pull request #1771 from frederic34/selectdelivery 
Select Shipping Method in Propal, Order
 2014-07-30 11:31:22 +02:00
Juanjo Menent
2783ec7dc8 New: Add PYME (base) accountancy spanish plan 2014-07-29 00:00:34 +02:00
frederic34
395b003266 Merge remote branch 'upstream/develop' into selectdelivery 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-28 17:10:07 +02:00
Laurent Destailleur
3d56c8ff6a Fix: [ bug #1537 ] Difference between societe.nom and adherent.societ 2014-07-26 18:20:40 +02:00
frederic34
4fcff3e2e5 Select delivery method for order 2014-07-25 17:20:42 +02:00
frederic34
f0a7cc3268 Select Shipping Method in Propal 2014-07-24 18:08:08 +02:00
Laurent Destailleur
d80de2cdd4 Fix: Clean before adding foreign key 2014-07-20 04:42:05 +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
Florian HENRY
d2e17eb321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-07-11 16:09:01 +02:00
Laurent Destailleur
4dfaf9ce38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661 New: Type of thirdparties can accept a country (to show list of types 
specific for a country).
 2014-07-11 13:56:35 +02:00
Florian HENRY
c7d31f4570 [ task #1204 ] Add ref_int contract field 2014-07-11 11:26:54 +02:00
frederic34
8c7b8bba52 Merge remote branch 'upstream/develop' into selectbank 2014-07-09 10:07:49 +02:00
Laurent Destailleur
e659b9e693 Merge remote-tracking branch 'origin/3.6' into develop 2014-07-09 00:30:23 +02:00
Laurent Destailleur
32c15132df Fix: sql syntax error 2014-07-08 23:19:46 +02:00
frederic34
c8e6387e52 Merge remote branch 'upstream/develop' into selectbank 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-08 22:46:38 +02:00
Laurent Destailleur
8bad4a3c1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
	htdocs/install/mysql/tables/llx_product_batch.key.sql
 2014-07-08 22:45:31 +02:00
Laurent Destailleur
f0056b3b95 Fix: Migration does not match tables 2014-07-08 22:40:06 +02:00
Laurent Destailleur
e624049161 Fix: Pb with migration with pgsql 2014-07-08 22:12:20 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden. 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
 2014-07-08 21:50:29 +02:00
frederic34
beb471980e Add fields for supplier order and invoice 2014-07-08 21:50:21 +02:00
Laurent Destailleur
2b83d3fda7 Fix: File for migration 3.5 to 3.6 was modified. 2014-07-08 21:44:55 +02:00
Laurent Destailleur
9b6b5feb4f Fix: ON DELETE CASCADE is forbidden. 2014-07-08 21:38:20 +02:00
Laurent Destailleur
94cd8debeb Fix: table declaration 
Fix: regretion into trigger management
 2014-07-08 21:24:36 +02:00
Laurent Destailleur
688d58413b Merge pull request #1710 from aspangaro/develop-accounting2 
New feature :: Add fiscal year
 2014-07-07 21:28:35 +02:00
Laurent Destailleur
1a2ed2138b New: Add new type of event (when type of events are used, not by 
default)
 2014-07-06 21:25:25 +02:00
Laurent Destailleur
ce3fa14511 New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to 
create an automatic event into agenda.
Qual: Removed hard coded rowid into data init.
 2014-07-06 19:25:15 +02:00
aspangaro
9eaeaae2fb Merge branch 'Upstream/develop' 2014-07-05 08:48:51 +02:00
aspangaro
be78e96313 Bug fix & add tab info 2014-07-05 08:47:01 +02:00
Laurent Destailleur
baea822ed5 Fix: Migration script 2014-07-04 18:24:48 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00
Laurent Destailleur
f9ee4b3c9d Merge branch 'db-relations' of github.com:marcosgdf/dolibarr into 
marcosgdf-db-relations

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-04 14:06:07 +02:00
Laurent Destailleur
9fa44e6221 Merge pull request #1706 from frederic34/patch-2 
Update 3.6.0-3.7.0.sql
 2014-07-04 13:21:57 +02:00
Juanjo Menent
72243d4f38 fix: Timestamp with default null 2014-07-04 12:32:57 +02:00
FRANCE Frédéric
8fc2d5ebb8 Update 3.6.0-3.7.0.sql 
llx_c_product doesn't exist
 2014-07-03 20:38:33 +02:00
Juanjo Menent
cb4c3a4431 [ task #1063 ] Allow edit localtaxes rate for thirds. Works 
withd database
 2014-07-03 15:51:46 +02:00
Laurent Destailleur
a1b6aedc90 Add field task_datehour 2014-07-03 12:53:26 +02:00