Commit Graph

48417 Commits

Author SHA1 Message Date
Laurent Destailleur
c83cb730fc Merge pull request #3134 from atm-alexis/NEW_add_hook_in_sendmail
NEW add hook in send mail
2015-07-11 20:46:01 +02:00
Laurent Destailleur
0eccfce9d0 Merge pull request #3184 from GPCsolutions/dolibarr-3183
Fix #3183 Make sure FormOther class is included.
2015-07-11 17:27:10 +02:00
Raphaël Doursenaud
f4cc1f647c Fix #3183 Make sure FormOther class is included. 2015-07-10 15:20:41 +02:00
Laurent Destailleur
688562a816 Fix regression: We can't yet set method __construct of DolibarrModules
abstract because this break compatibility with a lot of external module
and generate FATAL errors after migration. Because PHP is not yet able
to manage try catch on FATAL error, we can't catch such error. Using
bstract on constructor is so postponed.
2015-07-10 09:40:18 +02:00
Laurent Destailleur
0b9ed9a25c Fix PSR2. We must not have spaces after ( 2015-07-10 09:37:05 +02:00
Laurent Destailleur
3eb6ee2030 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-09 12:29:44 +02:00
Laurent Destailleur
c28ff6c257 NEW Add status into filters of graph 2015-07-09 12:29:01 +02:00
Juanjo Menent
f9757bf072 Merge pull request #3176 from aspangaro/develop-patch55
Fix #3166 : An accounting account can be alphanumeric (Need for EBP)
2015-07-09 09:45:59 +02:00
Juanjo Menent
407f27dca1 Merge pull request #3177 from aspangaro/develop-patch54
Update accountancy Step 2
2015-07-09 09:45:35 +02:00
aspangaro
600354e057 Update formventilation with elarifr modification 2015-07-09 07:48:09 +02:00
aspangaro
9fdc2991c7 Correct 2015-07-09 07:47:31 +02:00
aspangaro
46037dbc46 Add language key 2015-07-09 07:47:13 +02:00
aspangaro
0b19f2e068 Update list.php with elarifr modification 2015-07-09 07:46:58 +02:00
aspangaro
d286c18148 Update lines.php with elarifr modification 2015-07-09 07:11:08 +02:00
aspangaro
dbb5d3d386 Fix #3166 : An accounting account can be alphanumeric (Need for EBP) 2015-07-08 21:47:45 +02:00
Juanjo Menent
7e0229ded0 Merge pull request #3168 from aspangaro/develop-patch54
Update accountancy 1st step
2015-07-08 12:03:49 +02:00
aspangaro
a283d0ce93 Update from elarifr 2015-07-08 07:46:26 +02:00
aspangaro
4c72567c6b Update bookkeeping 2015-07-08 07:19:23 +02:00
aspangaro
f084a9472a Merge remote-tracking branch 'Upstream/develop' into develop-54 2015-07-08 07:05:43 +02:00
Laurent Destailleur
455a697f1a Merge pull request #3159 from marcosgdf/develop
FIX #2832: Fixed a problem with special characters in expense report PDF model
2015-07-07 19:35:50 +02:00
Laurent Destailleur
f0cc620296 Merge pull request #3160 from marcosgdf/more-oop2
Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove
2015-07-07 19:33:46 +02:00
Marcos García de La Fuente
eff573e753 Removed duplicated code from core modules 2015-07-07 13:08:26 +02:00
Marcos García de La Fuente
98344746cf Added missing scopes of modMyModule 2015-07-07 13:08:17 +02:00
Marcos García de La Fuente
56ff0c7350 Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove 2015-07-07 13:08:12 +02:00
Marcos García de La Fuente
b7809c788a FIX #2832: Fixed a problem with special characters in expense report PDF model 2015-07-07 12:27:36 +02:00
aspangaro
787d2310c1 Correct language key 2015-07-07 05:57:35 +02:00
Laurent Destailleur
0fd134f825 Merge pull request #2889 from GPCsolutions/commonobjectreview
[Qual] Reviewed commonobject
2015-07-06 23:57:34 +02:00
Laurent Destailleur
00d2047e4c Merge pull request #3152 from GPCsolutions/install
Install
2015-07-06 23:55:14 +02:00
Laurent Destailleur
43c0e7e249 Merge pull request #3150 from marcosgdf/more-oop
Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties
2015-07-06 23:52:00 +02:00
Laurent Destailleur
cfd5ca15fd Merge pull request #3153 from GPCsolutions/jquery
Fix: jquery path
2015-07-06 23:51:03 +02:00
Raphaël Doursenaud
5ebc84e999 [Qual] Reviewed commonobject
Added missing fields
Removed unused variables
Documented methods parameters
Checked return points
2015-07-06 17:03:25 +02:00
Raphaël Doursenaud
b508dce3ff Fix: jquery path 2015-07-06 16:48:10 +02:00
Raphaël Doursenaud
f3c319958f Fix: no PHP closing tag in generated files
Best practice
2015-07-06 16:39:49 +02:00
Raphaël Doursenaud
c28e863e2f Fix: jquery path 2015-07-06 16:39:42 +02:00
Raphaël Doursenaud
ef90cd39f8 Uniformized install logging 2015-07-06 16:34:31 +02:00
Raphaël Doursenaud
572ce7bcbb NEW: Rename install etape to step 2015-07-06 15:44:33 +02:00
Alexis ALGOUD
1277596242 Mode hook
in $conf->global->MAIN_DISABLE_ALL_MAILS
2015-07-06 00:51:17 +02:00
Laurent Destailleur
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +02:00
Marcos García de La Fuente
670596685f Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties
Related to #2670
2015-07-05 13:34:06 +02:00
Laurent Destailleur
089056f024 Filter on status on hierarchical view 2015-07-05 12:15:21 +02:00
aspangaro
627429326e Merge remote-tracking branch 'Upstream/develop' into develop-54 2015-07-05 05:59:10 +02:00
aspangaro
54d2a96d8e dir DOL_URL_ROOT 2015-07-05 05:56:45 +02:00
Laurent Destailleur
04ba12fab6 Add es_BO and fy_NL 2015-07-04 22:18:31 +02:00
Laurent Destailleur
1b6922fe81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 18:20:34 +02:00
Laurent Destailleur
324d855b9c Still working on project module to uniformize way of working with other
modules
2015-07-04 18:20:17 +02:00
Laurent Destailleur
eef7c995da Merge pull request #3149 from aspangaro/develop-patch53
Accountancy: Bank journal - Show user on salary payment & use new account to pay vat
2015-07-04 17:37:07 +02:00
Laurent Destailleur
cf7839f5fa Merge pull request #3148 from aspangaro/develop-patch52
New: Task #2567 Add accountancy code for VAT payments
2015-07-04 17:36:07 +02:00
aspangaro
ea4b7b98a1 Merge remote-tracking branch 'Upstream/develop' into develop-53 2015-07-04 16:41:53 +02:00
aspangaro
fc3995c0be Accountancy: Bank journal - Show user on salary payment & user new account to pay vat 2015-07-04 16:39:52 +02:00
aspangaro
56831ecd16 Correct travis 2015-07-04 16:13:44 +02:00