Laurent Destailleur
291340a39f
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-30 16:34:18 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Laurent Destailleur
d6dc495a42
Removed bad print
2015-01-30 16:01:56 +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
67c1ae8593
Fixed: condition to show menus
2015-01-30 15:47:27 +01:00
Laurent Destailleur
16fa19be87
Doc to send unblock requests
2015-01-28 23:06:05 +01:00
Laurent Destailleur
14be79d3e8
Better help
...
Bad var
2015-01-28 20:04:18 +01:00
Laurent Destailleur
9850b753fa
Tooltip at wrong place.
2015-01-28 19:37:09 +01:00
Laurent Destailleur
ad6af14edd
Fixed: Status was not visible if selected.
2015-01-28 19:27:56 +01:00
Laurent Destailleur
ffde00de81
Fixed date change was lost when changing event assignement.
2015-01-26 10:31:41 +01:00
Laurent Destailleur
da9f13bca9
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-25 22:30:05 +01:00
Laurent Destailleur
57c84089fe
Introduce warning to remind to do a backup before migration.
...
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
Laurent Destailleur
dfc0ab7bfb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-25 22:00:59 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
Laurent Destailleur
0647c49067
Merge pull request #2274 from aschio/develop
...
New: Added Extrafields for Supplier invoice lines and Supplier order lines
2015-01-25 19:21:03 +01:00
Laurent Destailleur
ffb3af4b23
Merge pull request #2279 from GPCsolutions/readme
...
Updated and revamped readme
2015-01-25 18:15:00 +01:00
Laurent Destailleur
820fc3dbc9
Merge pull request #2276 from aspangaro/3.7
...
Correct link & typo
2015-01-25 18:13:29 +01:00
Laurent Destailleur
e94d11ecf9
Merge pull request #2278 from GPCsolutions/contributing
...
Added contributing guidelines.
2015-01-25 18:00:38 +01:00
Laurent Destailleur
b926a77325
Merge pull request #2280 from aspangaro/3.7-Accountancy
...
FIXED Accounting module - Align integrate core version & module version 3.6
2015-01-25 17:53:17 +01:00
Laurent Destailleur
8fb6ade27a
Fix drag and drop in agenda view
2015-01-25 17:49:11 +01:00
Laurent Destailleur
3ebaaa38d2
Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC
2015-01-25 16:04:37 +01:00
aspangaro
68764ccea3
Debug
2015-01-25 15:35:34 +01:00
aspangaro
94a9d0159d
Align module with 3.7 & contrary
2015-01-25 15:24:16 +01:00
Laurent Destailleur
e49b8f9cbd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-25 11:40:11 +01:00
Laurent Destailleur
c7d5a45780
Prepare test for pgsql
2015-01-25 11:39:48 +01:00
aspangaro
ae11ab12f6
FIXED Accounting module - Align core & module 3.6
2015-01-25 06:54:17 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
Laurent Destailleur
267ba24820
Generalize option PROJECT_SHOW_REF_INTO_LISTS
2015-01-24 21:41:40 +01:00
Laurent Destailleur
aab7aacccf
Bad width
2015-01-23 18:41:53 +01:00
Laurent Destailleur
a4990a58b1
The badge was missing for shipment
2015-01-23 18:39:40 +01:00
Laurent Destailleur
083cf06908
Fixed: Tracking number restored on PDF shipments
...
Fixed: Translation
2015-01-23 18:33:33 +01:00
Raphaël Doursenaud
11179e5537
Updated and revamped readme
2015-01-23 16:12:59 +01:00
Raphaël Doursenaud
b862e28d5b
Added contributing guidelines.
...
See: https://github.com/blog/1184-contributing-guidelines
2015-01-23 15:07:51 +01:00
Laurent Destailleur
5306220e5e
Fixed: Translation
2015-01-23 02:21:43 +01:00
Laurent Destailleur
71a8f97c89
Optimize code
2015-01-23 02:11:10 +01:00
Laurent Destailleur
0ca1647e11
Fixed: Removed bad commited dir
2015-01-23 01:52:56 +01:00
Laurent Destailleur
2e7bfa856a
Fixed: bad url
2015-01-22 23:49:32 +01:00
Laurent Destailleur
4aa4f5f5e9
Merge remote-tracking branch 'origin_dolibarr/develop' into develop
2015-01-22 23:14:40 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
Laurent Destailleur
04afe935a5
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-01-22 21:47:32 +01:00
Laurent Destailleur
b7cff09ce6
Fixed travis errors
2015-01-22 21:46:22 +01:00
Laurent Destailleur
eedca43cc3
New: Add option PROJECT_ADD_SUBTOTAL_LINES to group by supplier lines
...
into refering project view.
2015-01-22 21:31:00 +01:00
aspangaro
e9e552533f
Correct link
2015-01-22 21:13:08 +01:00
aspangaro
467a274f76
Typo
2015-01-22 21:12:20 +01:00
Laurent Destailleur
b7328caa9a
Fixed: Bad date for supplier orders
2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3
Fix: select if field is null
2015-01-22 20:10:25 +01:00
Laurent Destailleur
7b8b189bac
Fix: select if field is null
2015-01-22 20:09:57 +01:00
Laurent Destailleur
c4782f960c
Qual: Removed not cleand function
2015-01-22 19:47:53 +01:00
Laurent Destailleur
0f7238937a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/commande/fiche.php
2015-01-22 18:55:26 +01:00
Laurent Destailleur
639d582a44
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-22 18:44:21 +01:00
