Laurent Destailleur
5bd59cd6d1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c
Fix rounding of currency unit prices
2021-01-11 13:36:53 +01:00
Laurent Destailleur
5660159a6d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bom/bom_card.php
2021-01-11 13:13:26 +01:00
Laurent Destailleur
16253a79ee
FIX GETPOST of qty with wrong parameters
...
Conflicts:
htdocs/bom/bom_card.php
2021-01-11 13:11:40 +01:00
Laurent Destailleur
445a751d6b
Fix price2num
2021-01-11 13:08:02 +01:00
Laurent Destailleur
c10072ccef
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-01-11 13:07:31 +01:00
Laurent Destailleur
788ef257a9
Fix GETPOST for qty
2021-01-11 13:02:05 +01:00
Laurent Destailleur
f3e28c2dd0
FIX GETPOST of qty with wrong parameters
2021-01-11 13:00:29 +01:00
Laurent Destailleur
7ba73f6c25
Fix price2num
2021-01-11 12:56:28 +01:00
Laurent Destailleur
fe7be8362f
Fix td balance
2021-01-11 12:03:28 +01:00
Laurent Destailleur
53f09e31cc
Update doc
2021-01-09 13:24:03 +01:00
Laurent Destailleur
f411b29b28
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/accountancy.lang
2021-01-09 02:34:43 +01:00
Laurent Destailleur
b3461161ec
Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH
2021-01-09 02:28:50 +01:00
Laurent Destailleur
a3fd6f07e9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-01-08 15:10:05 +01:00
Laurent Destailleur
243b227c33
Fix prerequisites
2021-01-08 15:09:49 +01:00
Laurent Destailleur
24c926b32f
Update doc
2021-01-08 15:09:16 +01:00
Laurent Destailleur
69c614ec2a
Sync transifex
2021-01-08 11:22:11 +01:00
Laurent Destailleur
b91bca7022
Fix the source object may have been modified with corrupted data.
2021-01-08 01:56:23 +01:00
Laurent Destailleur
8fca2ce2eb
Fix field size
2021-01-08 00:52:38 +01:00
Laurent Destailleur
0448bf07cb
Fix field size
2021-01-08 00:52:26 +01:00
Laurent Destailleur
53da17e051
Add column to count pageview on website module
2021-01-08 00:49:58 +01:00
Laurent Destailleur
2794327e10
Update box_birthdays.php
2021-01-07 12:50:14 +01:00
Lars Wallenborn
1880e51d1c
[FIX] sort order in birthday box
...
The current sort order is by date and not by day of month. This yields
the following unexpected results:
Given
* Person A, born on 1980-01-10
* Person B, born on 1970-01-30
I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
2021-01-07 12:50:07 +01:00
Laurent Destailleur
a498f8dfe1
Fix sort by day
2021-01-07 12:49:54 +01:00
Laurent Destailleur
094ea841db
Fix sort by day
2021-01-07 12:49:19 +01:00
Laurent Destailleur
28cb391924
Merge pull request #15922 from larsborn/develop
...
Fix sort order in birthday box
2021-01-07 12:47:30 +01:00
Laurent Destailleur
ddc3f35be1
Update box_birthdays.php
2021-01-07 12:47:16 +01:00
Laurent Destailleur
8c3e7b4dc6
Fix vardump
2021-01-07 12:43:15 +01:00
Laurent Destailleur
6da3ed1a51
Merge 2 exclusive options into 1
2021-01-07 12:39:51 +01:00
Lars Wallenborn
f578164b42
[FIX] sort order in birthday box
...
The current sort order is by date and not by day of month. This yields
the following unexpected results:
Given
* Person A, born on 1980-01-10
* Person B, born on 1970-01-30
I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
2021-01-07 11:43:11 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product
...
NEW: preload product description on selection for customer propal/order/invoice
2021-01-07 11:19:53 +01:00
Laurent Destailleur
55b46ca149
Merge pull request #15318 from bafbes/abb120353
...
New: add notification on ACTION_CREATE event
2021-01-07 11:17:33 +01:00
Laurent Destailleur
396cbdb79c
Merge pull request #15863 from aspangaro/13b5
...
Accountancy - Add date_export on new ledger & subledger to show edit or delete link when is not export yet
2021-01-07 11:15:37 +01:00
Laurent Destailleur
4f55d51eac
Merge pull request #15886 from FHenry/dev_add_column_propal_order
...
NEW : Column shippement method, payment mode, payment term in propal and order list
2021-01-07 11:04:30 +01:00
Laurent Destailleur
3d2dc59468
Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment
...
NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
2021-01-07 10:49:06 +01:00
Laurent Destailleur
3fa5c27bc7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-07 10:41:09 +01:00
Laurent Destailleur
e53cb4b530
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-07 10:40:58 +01:00
Laurent Destailleur
a1d20ed9c2
Merge pull request #15910 from atm-john/new/unit_type_selection_limit
...
NEW unit selection on object edit line
2021-01-07 10:33:07 +01:00
Laurent Destailleur
c2855d4d71
Update html.form.class.php
2021-01-07 10:32:23 +01:00
Laurent Destailleur
312f11d7b3
Update objectline_edit.tpl.php
2021-01-07 10:30:11 +01:00
Laurent Destailleur
2e61809910
Merge pull request #15915 from frederic34/patch-8
...
code syntax
2021-01-07 10:28:40 +01:00
Laurent Destailleur
8ca639b79f
Merge pull request #15916 from atm-maxime/fix_commonfieldadd_type
...
Fix date and datetime type in commonfield_add.tpl
2021-01-07 10:28:10 +01:00
Laurent Destailleur
3399ab2c5d
Fix phpcs
2021-01-07 10:20:41 +01:00
Maxime Kohlhaas
1b7d194e18
Finish fix on add form values
2021-01-07 09:03:25 +01:00
Alexandre SPANGARO
5606542220
FIX: Accountancy - Add control on required fields when we create an account
2021-01-07 06:59:40 +01:00
Alexandre SPANGARO
74ba7e68da
Mix two systems for create and edit account from balance
2021-01-07 06:27:36 +01:00
Alexandre SPANGARO
1f87bbbd01
Typo
2021-01-07 06:26:24 +01:00
Alexandre SPANGARO
4077565de9
Merge branch '13.0' into 13b5
2021-01-07 05:27:43 +01:00
Laurent Destailleur
aa05370566
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 21:34:36 +01:00
Laurent Destailleur
ce035eb4ce
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/bom/bom_card.php
2021-01-06 21:33:59 +01:00