Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 20:11:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,031 Commits 36 Branches 190 Tags
b51b6fa8c8870e0ec19997ba14db33c764f27293
Commit Graph

10237 Commits

Author SHA1 Message Date
aspangaro
358bcee3a5 Presentation on financiel account 2016-08-29 21:49:34 +02:00
Laurent Destailleur
d6d474f10d Clean code for category management. 2016-08-29 21:31:27 +02:00
Laurent Destailleur
2ba920a4cb Fix for jmobile 2016-08-29 11:33:48 +02:00
florian HENRY
56f0ffee0b add category entry menu into auguria menu sql 2016-08-29 10:47:13 +02:00
florian HENRY
a4ce756724 Manage project category 2016-08-29 10:32:00 +02:00
Laurent Destailleur
6ddd264178 Fix not used field 2016-08-28 17:45:20 +02:00
Laurent Destailleur
5e88de7e2c Fix field customer/prospect/supplier in list of thirdparties 2016-08-28 15:21:09 +02:00
Laurent Destailleur
2e7e5151b7 Merge pull request #5463 from hregis/develop_origin 
New: Add entity field in llx_societe_remise_except and llx_societe_remise
 2016-08-28 12:23:04 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
0d992b2b99 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/cron/class/cronjob.class.php
	htdocs/install/pgsql/functions/functions.sql
 2016-08-28 02:17:04 +02:00
Laurent Destailleur
bc8e203019 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-28 01:58:43 +02:00
Laurent Destailleur
5d7414dcc3 Solve php regression failing travis 2016-08-28 01:58:11 +02:00
Juanjo Menent
d9ca95acf7 Merge pull request #5649 from atm-maxime/new_textwithpicto_custom_picto 
Allow to use textwithpicto with a custom picto
 2016-08-25 13:44:25 +02:00
Regis Houssin
6e40f9e700 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/core/class/html.form.class.php

Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
 2016-08-25 10:15:26 +02:00
Laurent Destailleur
8f809e403d Uniformize code 2016-08-24 19:38:34 +02:00
Maxime Kohlhaas
52cbdf04c3 Allow to use textwithpicto with a custom picto 2016-08-23 11:03:47 +02:00
Laurent Destailleur
03c30c487c Uniformise code 2016-08-22 13:46:38 +02:00
Laurent Destailleur
0839a9fa4f Code comment 2016-08-20 00:54:49 +02:00
Laurent Destailleur
1fc5715040 Fix date of contract not used 2016-08-20 00:30:09 +02:00
Laurent Destailleur
83107746ad Fix no way to fix the ref of recurring invoice when an error was done 
into typing.
 2016-08-19 16:18:39 +02:00
Laurent Destailleur
fead7967f2 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/resource/class/resource.class.php
 2016-08-17 16:55:39 +02:00
Laurent Destailleur
42e573c7fb Merge pull request #5616 from marcosgdf/phpdoc 
Little changes to PHPDoc comment block
 2016-08-17 15:59:08 +02:00
Laurent Destailleur
69e6f6a489 Merge pull request #5608 from aspangaro/4.0-p40 
Fix: Some problems on export with language
 2016-08-17 15:54:36 +02:00
Laurent Destailleur
282c50ef34 Merge pull request #5631 from atm-florian/4.0 
FIX #5594
 2016-08-17 14:08:06 +02:00
Laurent Destailleur
caa0dd75aa Fix responsive design on small smartphone 2016-08-17 11:47:39 +02:00
Laurent Destailleur
ba8c2dbf9f Fix order of module for demo. 2016-08-17 11:39:11 +02:00
Laurent Destailleur
47489265b1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-17 11:15:30 +02:00
Laurent Destailleur
6724901b9e Fix closing td 2016-08-17 11:15:20 +02:00
florian HENRY
a1323756a9 FIX : in PgSQL no quote "word style" is permitted around column name 2016-08-17 10:23:23 +02:00
florian HENRY
0ac090e959 FIX : #5629 DoliDBPgsql::query SQL Error message: ERROR: 22P02: invalid 
input syntax for integer: ""
 2016-08-16 09:07:08 +02:00
florian HENRY
3932a32399 FIX : #5629 PgSQL Interger string stylish error 2016-08-16 09:00:52 +02:00
florian HENRY
aa17564e93 FIX: #5594 2016-08-16 08:54:12 +02:00
Raphaël Doursenaud
49cb61b530 CLOSE #5627 Allowed external logging modules. 
Removed Sentry logging.
 2016-08-16 03:24:04 +02:00
Laurent Destailleur
6b6ee8795c Button filter on boxes is at end of title line 2016-08-11 19:55:29 +02:00
Laurent Destailleur
7cc7ac5485 Fix translation 2016-08-11 17:41:09 +02:00
Marcos García de La Fuente
7e0b99d5ab Little changes to PHPDoc comment block 2016-08-11 15:23:00 +02:00
aspangaro
26df66f9ac Fix: Missing language file for salaries export 2016-08-10 15:11:51 +02:00
aspangaro
4e39c41215 Fix: Typo on invoice export 2016-08-10 15:07:53 +02:00
aspangaro
cdd84244b2 Fix: Missing Language file and key for category contact export 2016-08-10 14:48:26 +02:00
aspangaro
8028b77966 Fix: MIssing language file for category members export 2016-08-10 14:39:51 +02:00
aspangaro
c442ff0d2b Fix: Missing language file for user export when the module members is on 2016-08-10 14:29:19 +02:00
aspangaro
43ffb061ef FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option 2016-08-10 08:07:27 +02:00
florian HENRY
321814fae3 better fix for #5594 2016-08-09 15:17:19 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
57cbda416b Minor fix on stock 2016-08-08 20:41:49 +02:00
Laurent Destailleur
2133b1c3b5 NEW Table with list of lots/serial can be viewed (module product batch). 2016-08-08 20:31:03 +02:00
florian HENRY
90cb71f341 revert better fix 2016-08-08 13:54:51 +02:00
florian HENRY
15f187c466 better test 2016-08-08 13:54:03 +02:00
florian HENRY
94487cf411 FIX #5594 2016-08-08 13:43:44 +02:00
Laurent Destailleur
3f87b0c225 NEW Show photo of contacts on thirdparty card. 2016-08-06 00:04:24 +02:00