Laurent Destailleur
|
4d560a8e03
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-08 22:18:12 +02:00 |
|
Laurent Destailleur
|
a562e5a919
|
Maxi debug of accountancy ledger page.
|
2017-07-08 20:52:53 +02:00 |
|
Laurent Destailleur
|
cf6745b1ae
|
Debug module builder
|
2017-07-08 17:08:07 +02:00 |
|
Laurent Destailleur
|
8db4e91888
|
Debug modulebuilder
|
2017-07-08 15:43:36 +02:00 |
|
AlainRnet
|
8d1c8e2da7
|
Update main.lang
StatusInterInvoiced missing and I don't know its wording.
|
2017-07-08 08:09:02 +02:00 |
|
Laurent Destailleur
|
a9468ad84a
|
Look and feel v6
|
2017-07-08 00:42:55 +02:00 |
|
Laurent Destailleur
|
de24e93cca
|
Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list
NEW: Add column with nbr suppliers prices and WAP to product list.
|
2017-07-07 19:42:25 +02:00 |
|
Laurent Destailleur
|
8abec461a6
|
Fix total with tax does not include local taxes. To solve, i show both
totals.
|
2017-07-07 12:31:00 +02:00 |
|
Laurent Destailleur
|
de1a7042d4
|
Fix filter on list of actions
|
2017-07-07 10:55:42 +02:00 |
|
Laurent Destailleur
|
95cf36c43b
|
Fix use the getUrl function instead of hard coded curl
|
2017-07-04 10:55:53 +02:00 |
|
Laurent Destailleur
|
0ee93fb00c
|
Fix conflict between option login and logina and logint in agenda export
|
2017-07-04 10:29:38 +02:00 |
|
Laurent Destailleur
|
cb1c461b69
|
Work on module builder
|
2017-07-03 12:28:52 +02:00 |
|
Laurent Destailleur
|
8b91f4fb5e
|
Debug module website
|
2017-07-03 12:04:45 +02:00 |
|
Laurent Destailleur
|
9e26e6b0a3
|
Fix bad value for ref of old contracts
|
2017-07-03 11:42:17 +02:00 |
|
Laurent Destailleur
|
565de9bc8d
|
Debug module website
|
2017-07-02 23:38:19 +02:00 |
|
Laurent Destailleur
|
b7218c1bcd
|
Fix menu consistency
|
2017-07-01 03:18:17 +02:00 |
|
Laurent Destailleur
|
31fe8ebcee
|
Debug v6
|
2017-07-01 02:22:08 +02:00 |
|
fappels
|
989084e4de
|
WAP always 2 decimals
|
2017-06-30 10:56:05 +02:00 |
|
Laurent Destailleur
|
f7ba3ddc07
|
Fix translation
|
2017-06-29 15:59:46 +02:00 |
|
Laurent Destailleur
|
7e6e0ee3a4
|
Fix link to image of MD files
|
2017-06-27 20:02:46 +02:00 |
|
Laurent Destailleur
|
5dd8d1c4ef
|
Rename button to make clear for user that the export is not the real
journal but a temporary situation.
|
2017-06-27 17:56:45 +02:00 |
|
fappels
|
e3f7402e07
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list
|
2017-06-26 22:45:18 +02:00 |
|
fappels
|
13e5c8ff7a
|
Create patch
Add Number of supplier prices and wap columns
|
2017-06-26 22:44:56 +02:00 |
|
Alexandre SPANGARO
|
459fac4753
|
Merge remote-tracking branch 'uptream/develop' into 6.0-fec3
# Conflicts:
# htdocs/accountancy/customer/index.php
|
2017-06-22 05:30:21 +02:00 |
|
Alexandre SPANGARO
|
c381c213a5
|
Fix : Accountancy
|
2017-06-20 06:52:41 +02:00 |
|
Laurent Destailleur
|
fcdc7b1a0d
|
Fix pgsql compatibility
|
2017-06-20 01:53:34 +02:00 |
|
Laurent Destailleur
|
3717a01641
|
Fix lang
|
2017-06-19 23:15:47 +02:00 |
|
Laurent Destailleur
|
8dffc38cd5
|
Fix separator
|
2017-06-19 21:46:38 +02:00 |
|
Laurent Destailleur
|
504d376f84
|
Sync transifex
|
2017-06-19 21:34:33 +02:00 |
|
Laurent Destailleur
|
de423e531c
|
Sync nb_NO
|
2017-06-19 21:24:55 +02:00 |
|
Alexandre SPANGARO
|
e9b6afd2aa
|
Add last session coding - Add temporaly ledger
|
2017-06-18 22:17:32 +02:00 |
|
Laurent Destailleur
|
787d6946b2
|
Continue work started on module builder
|
2017-06-18 12:30:18 +02:00 |
|
Laurent Destailleur
|
69b26dcb4e
|
Work on modulebuilder
|
2017-06-17 21:23:52 +02:00 |
|
Laurent Destailleur
|
a6b4b15e07
|
Work on modulebuilder
|
2017-06-17 19:40:48 +02:00 |
|
Laurent Destailleur
|
b73228899a
|
Merge pull request #7024 from defrance/patch-14
Introduce weight conversion lb & oz
|
2017-06-17 17:52:20 +02:00 |
|
BENKE Charlene
|
db17363267
|
Update other.lang
|
2017-06-17 16:30:37 +02:00 |
|
Laurent Destailleur
|
8a1de52f3c
|
Fix translation
|
2017-06-17 12:00:33 +02:00 |
|
Laurent Destailleur
|
a4f34539ea
|
Fix translation
|
2017-06-17 11:46:45 +02:00 |
|
Laurent Destailleur
|
7c41c9a3e4
|
Fix activation of dependency for a dedicated country.
BlockedLog depends now on CashDesk only.
|
2017-06-17 11:43:00 +02:00 |
|
Laurent Destailleur
|
bebe7baa80
|
Fix images into medias not reabable into send emails
|
2017-06-17 10:44:08 +02:00 |
|
BENKE Charlene
|
f0bc72cda4
|
WeightUnitonce translation
|
2017-06-17 10:27:00 +02:00 |
|
Laurent Destailleur
|
5b7a8e9c90
|
Fix missing signature when sending email from user card
|
2017-06-17 10:17:36 +02:00 |
|
Laurent Destailleur
|
1c8daf9700
|
Standardize and debug code of module BlockedLog
|
2017-06-16 12:46:15 +02:00 |
|
Laurent Destailleur
|
26e80045a6
|
Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor
NEW log download or preview event on a validate bill
|
2017-06-16 11:06:27 +02:00 |
|
Laurent Destailleur
|
343e8d8498
|
Debug accounting module with new structure v6
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
|
2017-06-16 00:49:52 +02:00 |
|
Laurent Destailleur
|
ac708a8ee9
|
Debug accounting module with new structure v6
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
|
2017-06-15 23:58:56 +02:00 |
|
Laurent Destailleur
|
097be322a6
|
Modify code to match new v6 structure.
|
2017-06-15 19:29:00 +02:00 |
|
Laurent Destailleur
|
0b6d7a5b57
|
Modulebuilder
|
2017-06-14 12:05:47 +02:00 |
|
alexis Algoud
|
ef0907d89e
|
NEW log download or preview event on a validate bill
|
2017-06-13 15:55:22 +02:00 |
|
Laurent Destailleur
|
1519d0eb95
|
Merge pull request #6994 from atm-alexis/NEW_blocklog_develop_refactor
NEW blocklog view, export and fix
|
2017-06-13 15:00:47 +02:00 |
|
Laurent Destailleur
|
c0f46834cb
|
Fix demo links
|
2017-06-13 13:22:05 +02:00 |
|
alexis Algoud
|
f780af305a
|
NEW blocklog other things
fix minor
add view only for error
add download log as csv
add record event on bill send by mail event
|
2017-06-13 10:04:05 +02:00 |
|
Laurent Destailleur
|
ecf29332f3
|
Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor
NEW Blokedlog stuff
|
2017-06-12 17:44:27 +02:00 |
|
Alexis Algoud
|
0312d2479d
|
add block info popin, translation, hidden authority feature
|
2017-06-12 10:26:24 +02:00 |
|
Laurent Destailleur
|
277dde5d61
|
Fix dol_banner
|
2017-06-12 10:25:28 +02:00 |
|
Laurent Destailleur
|
542a72c684
|
NEW custom dir is enabled dy default on first install.
Fix modulebuilder when custom dir not defined.
|
2017-06-10 23:50:46 +02:00 |
|
Laurent Destailleur
|
58a407d9f1
|
Fix style and align when no permission on widget
|
2017-06-10 00:05:47 +02:00 |
|
Laurent Destailleur
|
b92980c6ff
|
Fix statistics on products
|
2017-06-09 10:38:06 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +02:00 |
|
Laurent Destailleur
|
a0295821ba
|
Fix errors in extra computed field
|
2017-06-07 11:38:42 +02:00 |
|
Laurent Destailleur
|
63920930bf
|
Merge branch 'develop' into 6.0-salary
|
2017-06-06 11:01:28 +02:00 |
|
Laurent Destailleur
|
22efbabfa6
|
NEW Add hook doUpgrade2
|
2017-06-06 01:34:25 +02:00 |
|
Laurent Destailleur
|
4e397107e1
|
Merge pull request #6934 from atm-florian/dev_loancalc
NEW : Add calculation function for Loan schedule
|
2017-06-03 01:10:39 +02:00 |
|
Laurent Destailleur
|
1761df2bc2
|
NEW Add page statistics for project tasks
|
2017-06-02 19:28:22 +02:00 |
|
florian HENRY
|
b0f2db7aaa
|
NEW : Add calculation function for Loan schedule
|
2017-06-02 17:48:29 +02:00 |
|
Laurent Destailleur
|
c59d216cf5
|
NEW Can read time spent of others (hierarchy only or all if granted)
|
2017-06-02 13:24:45 +02:00 |
|
Laurent Destailleur
|
5c58ed8ca7
|
Add a better error message when payment link is not valid.
|
2017-06-02 09:13:04 +02:00 |
|
Laurent Destailleur
|
77df19009d
|
Removed duplicated code
|
2017-06-01 12:11:45 +02:00 |
|
Alexandre SPANGARO
|
dc9d9b47b4
|
Fix : Missing language key
|
2017-05-31 21:35:26 +02:00 |
|
Laurent Destailleur
|
c9a09adf79
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/main.lang
|
2017-05-31 12:50:29 +02:00 |
|
Laurent Destailleur
|
c39ca4cff8
|
NEW Introduce function dol_compress_dir
|
2017-05-31 00:20:35 +02:00 |
|
Laurent Destailleur
|
5d115bcf69
|
Fix deadlock feature, can't process a leave request when validator has
left company.
|
2017-05-30 20:58:32 +02:00 |
|
Laurent Destailleur
|
fa6bc03765
|
Fix typo
|
2017-05-30 01:34:20 +02:00 |
|
Laurent Destailleur
|
d56cd44ebc
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-29 19:11:41 +02:00 |
|
Laurent Destailleur
|
7066ec7dab
|
NEW Can clone expense report on another user
|
2017-05-29 13:22:52 +02:00 |
|
Laurent Destailleur
|
395d361d66
|
Look and feel v6
|
2017-05-29 11:38:23 +02:00 |
|
Laurent Destailleur
|
30bc8b9a32
|
Fix typo
|
2017-05-29 11:00:36 +02:00 |
|
Laurent Destailleur
|
05a537dfb6
|
Merge pull request #6895 from grandoc/new_branch_25_05
New branch 25 05
|
2017-05-29 10:33:28 +02:00 |
|
Laurent Destailleur
|
c4f09b8894
|
Work on modulebuilder
|
2017-05-28 14:43:17 +02:00 |
|
Laurent Destailleur
|
c651f1da45
|
Work on modulebuilder tool
|
2017-05-27 19:05:36 +02:00 |
|
philippe grand
|
1f3a8b507e
|
missing translation
|
2017-05-25 22:02:57 +02:00 |
|
Laurent Destailleur
|
e5fe629a0e
|
NEW Extrafields support formulas to be computed using PHP expressions
|
2017-05-24 22:48:44 +02:00 |
|
Laurent Destailleur
|
c98f0ba457
|
Fix typo
|
2017-05-23 15:57:18 +02:00 |
|
Laurent Destailleur
|
2b9f654b8c
|
Fix translation
|
2017-05-22 15:31:05 +02:00 |
|
Laurent Destailleur
|
1a8884bbbe
|
NEW Can filter on year and product tags on the product statistic page
|
2017-05-22 15:20:52 +02:00 |
|
Laurent Destailleur
|
82560b9126
|
Look and feel v6
|
2017-05-22 10:58:20 +02:00 |
|
Laurent Destailleur
|
ba5fb700ba
|
Missing translation
|
2017-05-19 18:35:52 +02:00 |
|
Laurent Destailleur
|
d1c4439a0f
|
Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option
NEW Module Agenda: Add option - Show linked object into agenda view
|
2017-05-19 17:23:54 +02:00 |
|
Laurent Destailleur
|
330b9e7038
|
Merge pull request #6866 from absnc/project_element_shipping
NEW Enable shipments in Project overview tab
|
2017-05-19 17:10:51 +02:00 |
|
Laurent Destailleur
|
2a0a0f12f3
|
Merge pull request #6867 from OPEN-DSI/core_dict_actioncomm_modify_color_position
NEW Core dictionaries: Adds the ability to change the color and position …
|
2017-05-19 16:33:05 +02:00 |
|
Laurent Destailleur
|
4e7353f8a0
|
Clean code
|
2017-05-19 13:39:00 +02:00 |
|
Laurent Destailleur
|
aec4cef5de
|
Clean some code for type of event deprecated since 3.3
|
2017-05-19 12:58:38 +02:00 |
|
KHELIFA
|
2382a0a4ee
|
Core dictionaries: Adds the ability to change the color and position of the dictionary 'Types of agenda events'
|
2017-05-19 10:46:29 +02:00 |
|
absnc
|
7b784a1dcb
|
Enable shipments for project overview tab
|
2017-05-19 17:50:10 +11:00 |
|
Laurent Destailleur
|
f3838ee8f2
|
Fix limit into message
|
2017-05-17 18:52:01 +02:00 |
|
KHELIFA
|
169859b708
|
Module Agenda: Add option - Show linked object into agenda view
|
2017-05-17 17:00:45 +02:00 |
|
Laurent Destailleur
|
a8afa547f0
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture.php
|
2017-05-17 15:20:17 +02:00 |
|
Laurent Destailleur
|
d86b42b024
|
Missing title, bad css
|
2017-05-17 14:45:08 +02:00 |
|
Laurent Destailleur
|
9870cafea3
|
Better translation
|
2017-05-16 16:40:03 +02:00 |
|
Laurent Destailleur
|
ce84990414
|
NEW On invoices generated by template, we save if of source template.
|
2017-05-16 02:46:19 +02:00 |
|
Laurent Destailleur
|
789fbb6dc3
|
Enhance tooltips
|
2017-05-15 12:57:08 +02:00 |
|
Laurent Destailleur
|
caae7e4171
|
NEW It's easier to switch between sandbox and live for paypal
|
2017-05-14 17:05:13 +02:00 |
|
Laurent Destailleur
|
998254d9c6
|
Finish rewrite and debug of module Stripe.
|
2017-05-14 16:17:23 +02:00 |
|
Laurent Destailleur
|
9e4e72baee
|
Enhance module stripe
|
2017-05-14 05:26:19 +02:00 |
|
Laurent Destailleur
|
57ba598b15
|
Merge pull request #6771 from aspangaro/6.0-stripe
New : Module Stripe
|
2017-05-13 19:55:29 +02:00 |
|
Laurent Destailleur
|
f8403d5020
|
Fix phpunit test
|
2017-05-12 20:01:45 +02:00 |
|
Laurent Destailleur
|
f6dcb2860a
|
More complete help message
|
2017-05-12 19:14:54 +02:00 |
|
Laurent Destailleur
|
0d11fce834
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-12 15:45:30 +02:00 |
|
Laurent Destailleur
|
74af1223de
|
Fix company id for US
|
2017-05-12 11:26:24 +02:00 |
|
Laurent Destailleur
|
b09300ab61
|
NEW Can edit background color for odd and even lines in tables
|
2017-05-11 13:02:29 +02:00 |
|
Laurent Destailleur
|
1c7d9b9d9a
|
Merge pull request #6804 from aspangaro/6.0-multijournal
New : Accountancy - Add a list to select the bank journal in bank card
|
2017-05-10 22:46:30 +02:00 |
|
Laurent Destailleur
|
578eb98b33
|
Better user interface
|
2017-05-10 13:13:33 +02:00 |
|
Laurent Destailleur
|
c4722e3694
|
FIX XSS
|
2017-05-10 11:48:45 +02:00 |
|
Laurent Destailleur
|
5c33c1773f
|
FIX XSS
|
2017-05-10 11:47:34 +02:00 |
|
Laurent Destailleur
|
1748f1d451
|
Better tooltip for computed field
|
2017-05-09 17:00:07 +02:00 |
|
Laurent Destailleur
|
9fe28c9b2c
|
NEW Can disable all overwrote translations in one click.
|
2017-05-09 10:08:04 +02:00 |
|
Laurent Destailleur
|
c26d24e97d
|
Work on module builder
|
2017-05-09 00:00:09 +02:00 |
|
Laurent Destailleur
|
dd71fdc82f
|
Work on modulebuilder template
|
2017-05-08 21:00:23 +02:00 |
|
Alexandre SPANGARO
|
b05d2c50e8
|
Add mode live
|
2017-05-08 06:52:30 +02:00 |
|
Alexandre SPANGARO
|
16a41242d3
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-05-08 06:39:14 +02:00 |
|
Alexandre SPANGARO
|
dd97bbdc82
|
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
|
2017-05-07 15:10:30 +02:00 |
|
Laurent Destailleur
|
910a925167
|
NEW Add last activation author and ip of modules
|
2017-05-06 20:43:14 +02:00 |
|
Laurent Destailleur
|
d948447600
|
Add button to disable all personalized default values in one click.
|
2017-05-06 17:08:38 +02:00 |
|
Alexandre SPANGARO
|
7c4b47f20d
|
Update works
|
2017-05-06 08:33:12 +02:00 |
|
Laurent Destailleur
|
e8c60642e6
|
Translation fix
|
2017-05-06 03:21:47 +02:00 |
|
Laurent Destailleur
|
56140ae572
|
Work on default focus
|
2017-05-06 01:09:22 +02:00 |
|
Laurent Destailleur
|
885a636351
|
Debug new journal list page
|
2017-05-05 16:35:05 +02:00 |
|
Laurent Destailleur
|
11b1a2adac
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
|
2017-05-05 14:49:25 +02:00 |
|
Laurent Destailleur
|
b7f7683e5a
|
Merge pull request #6774 from aspangaro/6.0-multijournal
Finish to move accountancy journals list to page like dictionnary
|
2017-05-05 14:21:55 +02:00 |
|
Laurent Destailleur
|
dfa81bc806
|
Merge pull request #6792 from aspangaro/6.0-agiris
New : Accountancy - Add export model towards Agiris
|
2017-05-05 14:15:51 +02:00 |
|
Laurent Destailleur
|
a1ac3b470b
|
Change menu for setup of predefined emails
|
2017-05-05 14:01:20 +02:00 |
|
Laurent Destailleur
|
65e03ca3ba
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-05 12:34:22 +02:00 |
|
Laurent Destailleur
|
68b63927e0
|
Maxi miscellaneous debug
|
2017-05-05 12:33:49 +02:00 |
|
Laurent Destailleur
|
0a1ec514d2
|
Merge pull request #6772 from aspangaro/6.0-1
Add option on accounting account getNomUrl
|
2017-05-05 10:02:27 +02:00 |
|
Laurent Destailleur
|
f069ef9844
|
FIX #6767
|
2017-05-05 09:16:11 +02:00 |
|
Laurent Destailleur
|
768df56c07
|
Uniformize name of standard PDF template
|
2017-05-04 20:16:55 +02:00 |
|
Laurent Destailleur
|
2de335e2dc
|
Action must be a verb
|
2017-05-04 18:49:58 +02:00 |
|
Laurent Destailleur
|
7d5b5cf86a
|
Better behavior for tooltip on click
|
2017-05-04 13:09:42 +02:00 |
|
Laurent Destailleur
|
6fb8876e5a
|
Merge pull request #6730 from fappels/5.0_fix_en_US_admin_tag
Fix typo in en_US admin tag
|
2017-05-04 09:54:21 +02:00 |
|
Laurent Destailleur
|
3871da0324
|
Merge pull request #6729 from atm-florian/dev_importexport_ressources
NEW : Add module resources import/export
|
2017-05-04 09:43:00 +02:00 |
|
Alexandre SPANGARO
|
29bede28f0
|
New : Accountancy - Add export model towards Agiris
|
2017-05-04 06:49:29 +02:00 |
|
Alexandre SPANGARO
|
e58d2f428b
|
Merge remote-tracking branch 'uptream/develop' into 6.0-1
|
2017-05-01 20:31:08 +02:00 |
|
Laurent Destailleur
|
6e1f825190
|
Look and feel v6
|
2017-05-01 13:01:05 +02:00 |
|
Alexandre SPANGARO
|
cbd0598611
|
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
|
2017-05-01 08:16:55 +02:00 |
|
Alexandre SPANGARO
|
6afd0d642a
|
Finish to move accountancy journals list to page like dictionnary
|
2017-05-01 08:16:09 +02:00 |
|
Alexandre SPANGARO
|
e11254a9bf
|
Add option on accounting account getNomUrl
|
2017-04-30 15:04:51 +02:00 |
|
Laurent Destailleur
|
7c2b3b8df0
|
NEW When down payment is entered, discount to reuse into final invoice
is automatically created. This save one click into invoice workflow.
|
2017-04-30 12:55:11 +02:00 |
|
Laurent Destailleur
|
60951cf307
|
Less data example
|
2017-04-30 04:09:50 +02:00 |
|
Laurent Destailleur
|
4993a43025
|
Move new feature inventory into module stock.
|
2017-04-30 02:25:05 +02:00 |
|
Laurent Destailleur
|
92b5f8d85e
|
Move new feature inventory into module stock.
|
2017-04-29 21:53:01 +02:00 |
|